Widen two more suppressions, fix a broken suppression

checked in last time (and give it a different bug number),
add one that got away

BUG=11282,17966,20320,20653,20659
TEST=green valgrind bots

Review URL: http://codereview.chromium.org/177034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24872 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 56 insertions, 10 deletions

diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index 1e82d27..9205429 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -934,7 +934,7 @@
    Memcheck:Leak
    ...
    fun:_ZN7WebCore10StringImplC1EPKcjj
-   fun:_ZN3WTF9HashTableIPN7WebCore10StringImplES3_NS_17IdentityExtractorIS3_EENS1_10StringHashENS_10HashTraitsIS3_EES8_E18addPassingHashCodeIPKcSC_NS_24HashSetTranslatorAdapterIS3_S8_SC_NS1_17CStringTranslatorEEEEESt4pairINS_17HashTableIteratorIS3_S3_S5_S6_S8_S8_EEbERKT_RKT0_
+   ...
    fun:_ZN3WTF7HashSetIPN7WebCore10StringImplENS1_10StringHashENS_10HashTraitsIS3_EEE3addIPKcNS1_17CStringTranslatorEEESt4pairINS_24HashTableIteratorAdapterINS_9HashTableIS3_S3_NS_17IdentityExtractorIS3_EES4_S6_S6_EES3_EEbERKT_
    fun:_ZN7WebCore12AtomicString3addEPKc
    fun:_ZN7WebCore12AtomicStringC1EPKc
@@ -1108,6 +1108,18 @@
    fun:gtk_accel_group_disconnect_key
 }
 {
+   bug_20320b
+   Memcheck:Leak
+   fun:malloc
+   fun:g_malloc
+   fun:g_slice_alloc
+   fun:handlers_find
+   fun:signal_handlers_foreach_matched_R
+   fun:g_signal_handlers_disconnect_matched
+   fun:gtk_accel_label_set_accel_widget
+   fun:gtk_accel_label_destroy
+}
+{
    bug_20580
    Memcheck:Addr1
    fun:syncJournal
@@ -1160,3 +1172,15 @@
    fun:_Znw*
    fun:_ZN19SafeBrowsingService14OnIOInitializeEP11MessageLoopRKSsS3_
 }
+{
+   bug_20659
+   fun:_Znw*
+   fun:_ZN15tracked_objects10ThreadData12FindLifetimeERKNS_8LocationE
+   fun:_ZN15tracked_objects7Tracked13SetBirthPlaceERKNS_8LocationE
+   fun:_ZN11MessageLoop15PostTask_HelperERKN15tracked_objects8LocationEP4Taskxb
+   fun:_ZN11MessageLoop15PostDelayedTaskERKN15tracked_objects8LocationEP4Taskx
+   fun:_ZN4base16BaseTimer_Helper19InitiateDelayedTaskEPNS0_9TimerTaskE
+   fun:_ZN4base9BaseTimerI27SafeBrowsingProtocolManagerLb0EE5StartENS_9TimeDeltaEPS1_MS1_FvvE
+   fun:_ZN27SafeBrowsingProtocolManager18ScheduleNextUpdateEb
+   fun:_ZN27SafeBrowsingProtocolManager10InitializeEv
+}
diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt
index 790748c..6515c73 100644
--- a/tools/valgrind/memcheck/suppressions_mac.txt
+++ b/tools/valgrind/memcheck/suppressions_mac.txt
@@ -211,15 +211,6 @@
    fun:ats_font_get_glyphs_for_glyph_names
    fun:get_glyphs_for_glyph_names
 }
-{
-   # Write of unaddressible bytes
-   # http://www.sqlite.org/cvstrac/tktview?tn=694
-   bug_11282a
-   Memcheck:Param
-   fun:write$UNIX2003
-   fun:unixWrite
-   fun:sqlite3OsWrite
-}
 
 
 # 2. Intentional unit test errors, stuff that is somehow a false positive
@@ -573,3 +564,34 @@
    fun:_ZN16MessageLoopForIO19WatchFileDescriptorEibNS_4ModeEPN4base19MessagePumpLibevent21FileDescriptorWatcherEPNS2_7WatcherE
    fun:_ZN3IPC7Channel11ChannelImpl23ProcessOutgoingMessagesEv
 }
+{
+   # Strange...
+   bug_20653a
+   Memcheck:Param
+   write(buf)
+   fun:write$UNIX2003
+   fun:unixWrite
+   fun:sqlite3OsWrite
+   fun:pager_write_pagelist
+   fun:sqlite3PagerCommitPhaseOne
+}
+{
+   # Strange...
+   bug_20653b
+   Memcheck:Addr4
+   fun:sqlite3MemSize
+   fun:sqlite3MallocSize
+   fun:sqlite3PageFree
+   fun:pager_truncate_cache
+   fun:pager_truncate
+   fun:pager_playback
+   fun:sqlite3PagerRollback
+   fun:sqlite3BtreeRollback
+   fun:sqlite3RollbackAll
+   fun:sqlite3VdbeHalt
+   fun:sqlite3VdbeExec
+   fun:sqlite3Step
+   fun:sqlite3_step
+   fun:sqlite3_exec
+   fun:_ZN14SQLTransaction10EndCommandEPKc
+}