From: Julian Seward <jseward@acm.org>
Date: Mon, 26 Aug 2002 10:51:01 +0000 (+0000)
Subject: Don't compare actual addresses for FreeErr and FreeMismatchErr.  Doing
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=933f4807cd13dee42b81069ba0a5eac1c3e21a91;p=thirdparty%2Fvalgrind.git

Don't compare actual addresses for FreeErr and FreeMismatchErr.  Doing
so generates far too many duplicate errors in some circumstances.

MERGE TO HEAD


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_1_0_BRANCH@638
---

diff --git a/vg_errcontext.c b/vg_errcontext.c
index 52c7c6cdd4..5ba77f78db 100644
--- a/vg_errcontext.c
+++ b/vg_errcontext.c
@@ -274,9 +274,14 @@ static Bool eq_ErrContext ( Bool cheap_addr_cmp,
          return True;
       case FreeErr:
       case FreeMismatchErr:
-         if (e1->addr != e2->addr) return False;
-         if (!eq_AddrInfo(cheap_addr_cmp, &e1->addrinfo, &e2->addrinfo)) 
-            return False;
+         /* JRS 2002-Aug-26: comparing addrs seems overkill and can
+            cause excessive duplication of errors.  Not even AddrErr
+            below does that.  So don't compare either the .addr field
+            or the .addrinfo fields. */
+         /* if (e1->addr != e2->addr) return False; */
+         /* if (!eq_AddrInfo(cheap_addr_cmp, &e1->addrinfo, &e2->addrinfo)) 
+               return False;
+         */
          return True;
       case AddrErr:
          if (e1->axskind != e2->axskind) return False;