cache other.p in assignment; this should fix the "assignment of

[ginac.git] / ginac / ptr.h

diff --git a/ginac/ptr.h b/ginac/ptr.h
index 93b16416f5471d9bd9eb165fd7d159767a3f2522..4c4ea71d6bbfde7d70a1f0e563f29d9ef3c1d164 100644 (file)
--- a/ginac/ptr.h
+++ b/ginac/ptr.h
@@ -3,7 +3,7 @@
  *  Reference-counted pointer template. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -80,11 +80,14 @@ public:
 
        ptr &operator=(const ptr & other)
        {
-               // NB: must first add reference to "other", since other might be *this.
-               other.p->add_reference();
+               // NB1: Must first add reference to "other", since other might be *this.
+               // NB2: Cache other.p, because if "other" is a subexpression of p,
+               //      deleting p will also invalidate "other".
+               T *otherp = other.p;
+               otherp->add_reference();
                if (p->remove_reference() == 0)
                        delete p;
-               p = other.p;
+               p = otherp;
                return *this;
        }