Generalize valgrind suppressions & a 2 more

https://codereview.chromium.org/107443004/



git-svn-id: http://skia.googlecode.com/svn/trunk@12531 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tools/valgrind.supp b/tools/valgrind.supp
index 5c9a79b..fbacf9b 100644
--- a/tools/valgrind.supp
+++ b/tools/valgrind.supp
@@ -32,34 +32,46 @@
     fun:FcPatternObjectInsertElt
     fun:FcPatternObjectAddWithBinding
 }
-{

-    driver_bug_1

-    Memcheck:Param

-    ioctl(generic)

-    fun:ioctl

-    ...

-    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so

-}

-{

-    driver_bug_2

-    Memcheck:Cond

-    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so

-}

-{

-    driver_bug_3

-    Memcheck:Addr8

-    fun:memcpy@GLIBC_2.2.5

-    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so

-}

+{
+    driver_bug_1
+    Memcheck:Param
+    ioctl(generic)
+    fun:ioctl
+    ...
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
+{
+    driver_bug_2
+    Memcheck:Cond
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
+{
+    driver_bug_3
+    Memcheck:Addr8
+    ...
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
 {

     driver_bug_4

-    Memcheck:Addr2

-    fun:memcpy@GLIBC_2.2.5

-    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so

-}

-{

-    driver_bug_5

-    Memcheck:Addr1

-    fun:memcpy@GLIBC_2.2.5

-    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so

-}
\ No newline at end of file
+    Memcheck:Addr4

+    ...

+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
+{
+    driver_bug_5
+    Memcheck:Addr2
+    ...
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
+{
+    driver_bug_6
+    Memcheck:Addr1
+    ...
+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}
+{
+    driver_bug_7
+    Memcheck:Leak

+    fun:malloc

+    obj:/usr/lib/x86_64-linux-gnu/dri/fglrx_dri.so
+}