summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-17 15:42:35 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-17 15:42:35 +0000
commite5678149002cbb0955b0b062647f965aae63976d (patch)
tree1977feb3fc28578808c66dda14d0a1f5d54677d4
parentaafcf51cdc16f1aeee81e9436277444c6da9abb6 (diff)
downloadchromium_src-e5678149002cbb0955b0b062647f965aae63976d.zip
chromium_src-e5678149002cbb0955b0b062647f965aae63976d.tar.gz
chromium_src-e5678149002cbb0955b0b062647f965aae63976d.tar.bz2
Fixes a leak in [LinkInfoBarController addAdditionalControls].
Removes the valgrind suppression for this leak. Valgrind: 1, rohitrao: 0 BUG=17002 TEST=No more leaky. Review URL: http://codereview.chromium.org/159005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20955 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/cocoa/infobar_controller.mm4
-rw-r--r--tools/valgrind/memcheck/suppressions_mac.txt30
2 files changed, 2 insertions, 32 deletions
diff --git a/chrome/browser/cocoa/infobar_controller.mm b/chrome/browser/cocoa/infobar_controller.mm
index 5f8083e..a7c1a30 100644
--- a/chrome/browser/cocoa/infobar_controller.mm
+++ b/chrome/browser/cocoa/infobar_controller.mm
@@ -118,8 +118,8 @@
// Create the attributed string for the main message text.
NSMutableAttributedString* infoText =
- [[NSMutableAttributedString alloc]
- initWithString:base::SysWideToNSString(message)];
+ [[[NSMutableAttributedString alloc]
+ initWithString:base::SysWideToNSString(message)] autorelease];
[infoText addAttributes:linkAttributes
range:NSMakeRange(0, [infoText length])];
diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt
index 0d4a0cc..b789829 100644
--- a/tools/valgrind/memcheck/suppressions_mac.txt
+++ b/tools/valgrind/memcheck/suppressions_mac.txt
@@ -327,33 +327,3 @@
fun:_pthread_start
fun:thread_start
}
-
-{
- # Temporary suppression until crbug.com/17002 is fixed
- bug_17002
- Memcheck:Leak
- fun:malloc_zone_calloc
- fun:_internal_class_createInstanceFromZone
- fun:NSAllocateObject
- fun:+[NSObject alloc]
- fun:-[LinkInfoBarController addAdditionalControls]
- fun:-[InfoBarController awakeFromNib]
- fun:-[NSIBObjectData nibInstantiateWithOwner:topLevelObjects:]
- fun:-[NSNib instantiateNibWithExternalNameTable:]
- fun:-[NSNib instantiateNibWithOwner:topLevelObjects:]
- fun:-[NSViewController loadView]
- fun:-[NSViewController view]
- fun:-[InfoBarContainerController(PrivateMethods) addInfoBar:]
- fun:_ZN12_GLOBAL__N_156InfoBarContainerControllerTest_AddAndRemoveInfoBars_Test8TestBodyEv
- fun:_ZN7testing4Test3RunEv
- fun:_ZN7testing8internal12TestInfoImpl3RunEv
- fun:_ZN7testing8internal12TestInfoImpl7RunTestEPNS_8TestInfoE
- fun:_ZNK7testing8internal4ListIPNS_8TestInfoEE7ForEachIPFvS3_EEEvT_
- fun:_ZN7testing8TestCase3RunEv
- fun:_ZN7testing8TestCase11RunTestCaseEPS0_
- fun:_ZNK7testing8internal4ListIPNS_8TestCaseEE7ForEachIPFvS3_EEEvT_
- fun:_ZN7testing8internal12UnitTestImpl11RunAllTestsEv
- fun:_ZN7testing8UnitTest3RunEv
- fun:_ZN9TestSuite3RunEv
- fun:main
-}