|
From: Paul F. <pa...@fr...> - 2006-11-15 21:46:02
|
Hi
I got a copy from svn. Here are the two changes that I needed to make:
svn diff mc_main.c
Index: mc_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- mc_main.c (revision 6354)
+++ mc_main.c (working copy)
@@ -3432,7 +3432,7 @@
return (ekind =3D=3D FreeErr || ekind =3D=3D FreeMismatchErr);
case OverlapSupp:
- return (ekind =3D OverlapErr);
+ return (ekind =3D=3D OverlapErr);
case LeakSupp:
return (ekind =3D=3D LeakErr);
(that one's a no-brainer)
svn diff m_errormgr.c
Index: m_errormgr.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- m_errormgr.c (revision 6354)
+++ m_errormgr.c (working copy)
@@ -1161,7 +1161,11 @@
// up comparing "malloc" in the suppression against
// "_vgrZU_libcZdsoZa_malloc" in the backtrace, and the
// two of them need to be made to match.
+/*
if (!VG_(get_fnname_Z_demangle_only)(a, caller_name, ERRTXT_=
LEN))
+*/
+ if (!VG_(get_fnname_nodemangle)(a, caller_name, ERRTXT_LEN))
+
VG_(strcpy)(caller_name, "???");
break;
default: VG_(tool_panic)("supp_matches_callers");
Here, su->callers[i].name was in mangled format, so getting caller_name i=
n
demangled format resulted in the function returning false, and the error =
that
was in my suppression file was printed.
A+
Paul
|