diff options
| author | dtseng@chromium.org <dtseng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 20:40:49 +0000 |
|---|---|---|
| committer | dtseng@chromium.org <dtseng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-21 20:40:49 +0000 |
| commit | 34382243579faed133d9843053c98bbd38abdf59 (patch) | |
| tree | a3aa18ee39c94cead182edcd1f8040d4b6cb98ea | |
| parent | 2fe15fcba896e2316db1b0949f729bd21d4bd926 (diff) | |
| download | chromium_src-34382243579faed133d9843053c98bbd38abdf59.zip chromium_src-34382243579faed133d9843053c98bbd38abdf59.tar.gz chromium_src-34382243579faed133d9843053c98bbd38abdf59.tar.bz2 | |
Fix valgrind error.
BUG=59963
TEST=run chrome_test.sh from valgrind scripts and run unit test for BrowserAccessibilityTest.*.
Review URL: http://codereview.chromium.org/3995006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63405 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/accessibility/browser_accessibility_mac.mm | 9 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions_mac.txt | 14 |
2 files changed, 6 insertions, 17 deletions
diff --git a/chrome/browser/accessibility/browser_accessibility_mac.mm b/chrome/browser/accessibility/browser_accessibility_mac.mm index 4df23c6..3048b60 100644 --- a/chrome/browser/accessibility/browser_accessibility_mac.mm +++ b/chrome/browser/accessibility/browser_accessibility_mac.mm @@ -33,12 +33,15 @@ void BrowserAccessibilityMac::Initialize() { void BrowserAccessibilityMac::ReleaseReference() { if (browser_accessibility_cocoa_) { - // Relinquish ownership of the cocoa obj. - [browser_accessibility_cocoa_ release]; + BrowserAccessibilityCocoa* temp = browser_accessibility_cocoa_; browser_accessibility_cocoa_ = nil; + // Relinquish ownership of the cocoa obj. + [temp release]; // At this point, other processes may have a reference to - // browser_accessibility_cocoa_. When the retain count hits zero, it will + // the cocoa object. When the retain count hits zero, it will // destroy us in dealloc. + // For that reason, do *not* make any more calls here after + // as we might have been deleted. } } diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt index f00d8ca..c73d406 100644 --- a/tools/valgrind/memcheck/suppressions_mac.txt +++ b/tools/valgrind/memcheck/suppressions_mac.txt @@ -898,17 +898,3 @@ fun:_ZN24BrowserAccessibilityTest5SetUpEv fun:_ZN7testingL35HandleExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS3_FS2_vEPKc } -{ - bug_59963 - Memcheck:Addr4 - fun:_ZN23BrowserAccessibilityMac16ReleaseReferenceEv - ... - fun:_ZN27BrowserAccessibilityManagerD2Ev - fun:_ZN30BrowserAccessibilityManagerMacD0Ev - fun:_ZN10scoped_ptrI27BrowserAccessibilityManagerED2Ev - fun:_ZN10scoped_ptrI27BrowserAccessibilityManagerED1Ev - fun:_ZN24BrowserAccessibilityTestD2Ev - fun:_ZN41BrowserAccessibilityTest_* - fun:_ZN7testing4Test11DeleteSelf_Ev - fun:_ZN7testingL35HandleExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS3_FS2_vEPKc -} |