From: Julian Seward <jseward@acm.org>
Date: Fri, 17 Jul 2009 16:34:30 +0000 (+0000)
Subject: deepCopyIRCAS: handle NULL dataHi and expdHi without segfaulting.
X-Git-Tag: svn/VALGRIND_3_5_0^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d84b61df8b8eede7e7d807b91d304409bf4873f0;p=thirdparty%2Fvalgrind.git

deepCopyIRCAS: handle NULL dataHi and expdHi without segfaulting.



git-svn-id: svn://svn.valgrind.org/vex/trunk@1910
---

diff --git a/VEX/priv/ir_defs.c b/VEX/priv/ir_defs.c
index f58c60c08a..971370df82 100644
--- a/VEX/priv/ir_defs.c
+++ b/VEX/priv/ir_defs.c
@@ -1460,9 +1460,9 @@ IRCAS* deepCopyIRCAS ( IRCAS* cas )
 {
    return mkIRCAS( cas->oldHi, cas->oldLo, cas->end,
                    deepCopyIRExpr(cas->addr),
-                   deepCopyIRExpr(cas->expdHi),
+                   cas->expdHi==NULL ? NULL : deepCopyIRExpr(cas->expdHi),
                    deepCopyIRExpr(cas->expdLo),
-                   deepCopyIRExpr(cas->dataHi),
+                   cas->dataHi==NULL ? NULL : deepCopyIRExpr(cas->dataHi),
                    deepCopyIRExpr(cas->dataLo) );
 }