diff options
author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-16 06:27:43 +0000 |
---|---|---|
committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-16 06:27:43 +0000 |
commit | a948ff845c92bc52858fc8e91cd4c601e0f9c0d1 (patch) | |
tree | eef3b8bc3811d45279c1bd704a13b9f2d8fa6ddf /content/common | |
parent | 16dbde04fea24fd7fc48685e47f2adbd88c650a8 (diff) | |
download | chromium_src-a948ff845c92bc52858fc8e91cd4c601e0f9c0d1.zip chromium_src-a948ff845c92bc52858fc8e91cd4c601e0f9c0d1.tar.gz chromium_src-a948ff845c92bc52858fc8e91cd4c601e0f9c0d1.tar.bz2 |
Fix leak in LoadSandboxTemplate found by Valgrind
BUG=109901
TEST=waterfall.sh
Review URL: http://codereview.chromium.org/9224003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
-rw-r--r-- | content/common/sandbox_mac.mm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm index 24d9453..c90b672 100644 --- a/content/common/sandbox_mac.mm +++ b/content/common/sandbox_mac.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -20,6 +20,7 @@ extern "C" { #include "base/rand_util_c.h" #include "base/mac/scoped_cftyperef.h" #include "base/mac/scoped_nsautorelease_pool.h" +#include "base/memory/scoped_nsobject.h" #include "base/string16.h" #include "base/string_piece.h" #include "base/string_util.h" @@ -376,15 +377,15 @@ NSString* LoadSandboxTemplate(int sandbox_type) { return nil; } - NSString* common_sandbox_prefix_data = + scoped_nsobject<NSString> common_sandbox_prefix_data( [[NSString alloc] initWithBytes:common_sandbox_definition.data() length:common_sandbox_definition.length() - encoding:NSUTF8StringEncoding]; + encoding:NSUTF8StringEncoding]); - NSString* sandbox_data = + scoped_nsobject<NSString> sandbox_data( [[NSString alloc] initWithBytes:sandbox_definition.data() length:sandbox_definition.length() - encoding:NSUTF8StringEncoding]; + encoding:NSUTF8StringEncoding]); // Prefix sandbox_data with common_sandbox_prefix_data. return [common_sandbox_prefix_data stringByAppendingString:sandbox_data]; |