From: Julian Seward <jseward@acm.org>
Date: Sun, 15 Sep 2002 10:14:10 +0000 (+0000)
Subject: merge rev 1.3.8.13:
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f240c013aa59af4ee60860e6b057ad5934eddcd;p=thirdparty%2Fvalgrind.git

merge rev 1.3.8.13:

VG_(eq_ExeContext): don't dereference null e1 or e2.  Seems to fix
some segfaults pertaining to address errors etc.


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

diff --git a/vg_execontext.c b/vg_execontext.c
index 1746a81b31..9330b159b1 100644
--- a/vg_execontext.c
+++ b/vg_execontext.c
@@ -113,6 +113,8 @@ Bool VG_(eq_ExeContext_all) ( ExeContext* e1, ExeContext* e2 )
 {
    vg_ec_cmpAlls++;
    /* Just do pointer comparison. */
+   if (e1 == NULL || e2 == NULL) 
+      return False;
    if (e1 != e2) return False;
    return True;
 }
@@ -122,6 +124,8 @@ Bool VG_(eq_ExeContext_all) ( ExeContext* e1, ExeContext* e2 )
 Bool VG_(eq_ExeContext_top2) ( ExeContext* e1, ExeContext* e2 )
 {
    vg_ec_cmp2s++;
+   if (e1 == NULL || e2 == NULL) 
+      return False;
    if (e1->eips[0] != e2->eips[0]
        || e1->eips[1] != e2->eips[1]) return False;
    return True;
@@ -132,6 +136,8 @@ Bool VG_(eq_ExeContext_top2) ( ExeContext* e1, ExeContext* e2 )
 Bool VG_(eq_ExeContext_top4) ( ExeContext* e1, ExeContext* e2 )
 {
    vg_ec_cmp4s++;
+   if (e1 == NULL || e2 == NULL) 
+      return False;
    if (e1->eips[0] != e2->eips[0]
        || e1->eips[1] != e2->eips[1]) return False;