diff options
| -rw-r--r-- | content/common/sandbox_mac.mm | 11 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 18 |
2 files changed, 6 insertions, 23 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]; diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 86671c8..704c05b 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -5572,24 +5572,6 @@ fun:_ZN7WebCore17IDBCursorInternalL16continueCallbackERKN2v89ArgumentsE } { - bug_109901 - Memcheck:Leak - fun:malloc_zone_malloc - fun:_CFRuntimeCreateInstance - fun:__CFStringCreateImmutableFunnel3 - fun:CFStringCreateWithBytes - fun:-[NSPlaceholderString initWithBytes:length:encoding:] - fun:_ZN7sandbox19LoadSandboxTemplateEi - fun:_ZN7sandbox7Sandbox13EnableSandboxEiRK8FilePath - fun:_ZN7content17InitializeSandboxEiRK8FilePath - fun:_ZN7content17InitializeSandboxEv - fun:_ZN28RendererMainPlatformDelegate13EnableSandboxEv - fun:_Z12RendererMainRKN7content18MainFunctionParamsE - fun:_ZN12_GLOBAL__N_123RunNamedProcessTypeMainERKSsRKN7content18MainFunctionParamsEPNS2_19ContentMainDelegateE - fun:_ZN7content11ContentMainEiPPKcPNS_19ContentMainDelegateE - fun:ChromeMain -} -{ bug_109998 Memcheck:Leak ... |