Improve suppressions for zlib-1.2.x. Needs further work, but this

is a start.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8695

diff --git a/xfree-4.supp b/xfree-4.supp
index b41fc17ba69768e00bd087b6af9a314cde77bbce..ac51e36b060bb707470d4bf90bb6d6abff8c6a45 100644 (file)
--- a/xfree-4.supp
+++ b/xfree-4.supp
@@ -302,15 +302,32 @@
    fun:for__add_to_lf_table
 }
 
+
 # zlib-1.2.x uses uninitialised memory in some tricky way which
 # apparently is harmless (it must amount to a vectorised while-loop,
 # nothing else makes sense).  Fools Memcheck though.  See the mentioned
 # URL for details.
 {
-   zlib-1.2.x trickyness: See http://www.zlib.net/zlib_faq.html#faq36
+   zlib-1.2.x trickyness (1a): See http://www.zlib.net/zlib_faq.html#faq36
    Memcheck:Cond
-   obj:/lib64/libz.so.1.2.*
-   obj:/lib64/libz.so.1.2.*
+   obj:/*lib*/libz.so.1.2.*
+   obj:/*lib*/libz.so.1.2.*
+   fun:deflate
+}
+
+{
+   zlib-1.2.x trickyness (2a): See http://www.zlib.net/zlib_faq.html#faq36
+   Memcheck:Value8
+   obj:/*lib*/libz.so.1.2.*
+   obj:/*lib*/libz.so.1.2.*
+   fun:deflate
+}
+
+{
+   zlib-1.2.x trickyness (3a): See http://www.zlib.net/zlib_faq.html#faq36
+   Memcheck:Value4
+   obj:/*lib*/libz.so.1.2.*
+   obj:/*lib*/libz.so.1.2.*
    fun:deflate
 }