diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 00:42:46 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 00:42:46 +0000 |
| commit | f9b6a59cc4eccee9f52c250d3c8221cdbe3c0f35 (patch) | |
| tree | 2a0d830e11d1be7b44322dac3ebfcbbc4e6500a5 /tools | |
| parent | b7e1492380bd57394cda52931ffd81afa112fd33 (diff) | |
| download | chromium_src-f9b6a59cc4eccee9f52c250d3c8221cdbe3c0f35.zip chromium_src-f9b6a59cc4eccee9f52c250d3c8221cdbe3c0f35.tar.gz chromium_src-f9b6a59cc4eccee9f52c250d3c8221cdbe3c0f35.tar.bz2 | |
Don't initialize NSS before calling SSL_ClearSessionCache.
If NSS is not initialized, conceptually the SSL session
cache is empty. So it doesn't make sense to initialize
NSS just to clear an empty SSL session cache.
Remove the suppression for the leak this CL fixes from
suppressions_mac.txt. Widen a related suppression in
suppressions.txt to cover this leak.
R=mattm@chromium.org,cbentzel@chromium.org
BUG=105431,95718
TEST=valgrind bots should not report a leak in
SSL_ClearSessionCache.
Review URL: http://codereview.chromium.org/8849005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113715 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 6 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions_mac.txt | 13 |
2 files changed, 0 insertions, 19 deletions
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 508e07e..7818328 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -977,12 +977,6 @@ fun:PR_CallOnce fun:ssl_InitSessionCacheLocks fun:lock_cache - fun:ssl_LookupSID - fun:ssl2_BeginClientHandshake - fun:ssl_Do1stHandshake - fun:SSL_ForceHandshake - fun:_ZN3net18SSLClientSocketNSS11DoHandshakeEv - fun:_ZN3net18SSLClientSocketNSS15DoHandshakeLoopEi } { # Intentionally leaking NSS to prevent shutdown crashes diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt index f39586c..12a3438 100644 --- a/tools/valgrind/memcheck/suppressions_mac.txt +++ b/tools/valgrind/memcheck/suppressions_mac.txt @@ -1742,19 +1742,6 @@ fun:_ZN5media51FFmpegVideoDecodeEngineTest_DecodeFrame_Normal_TestD0Ev } { - bug_95718_b - Memcheck:Leak - fun:calloc - fun:PR_NewLock - fun:ssl_Init* - fun:InitSessionCacheLocks - fun:initSessionCacheLocksLazily - fun:PR_CallOnce - fun:ssl_InitSessionCacheLocks - fun:lock_cache - fun:SSL_ClearSessionCache -} -{ bug_96300 Memcheck:Leak ... |