Changeset c37f6e in git

Timestamp:

Aug 30, 2016, 4:43:49 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7e2307f3485ab92e550254c1212dafc2940b41ea

Parents:

c20f9f3118a723a20bf51e6296fce23f2ee87a60

Message:

fix: (memory leak ssi): if d->r similiar to currRing, clean it and use currRing

File:

• Singular/links/ssiLink.cc (modified) (4 diffs)

Singular/links/ssiLink.cc

@@ -78 +78 @@
 
 // the helper functions:
-void ssiSetCurrRing(const ring r)
+BOOLEAN ssiSetCurrRing(const ring r) /* returned: not accepted */
 {
   //  if (currRing!=NULL)
@@ -95 +95 @@
     r->ref++;
     rSetHdl(h);
+    return FALSE;
+  }
+  else
+  {
+    rKill(r);
+    return TRUE;
   }
 }
@@ -1269 +1275 @@
              if (d->r!=NULL)
              {
-               d->r->ref++;
-               ssiSetCurrRing(d->r);
+               if(ssiSetCurrRing(d->r)) { d->r=currRing; d->r->ref++; }
              }
              if (t==15) // setring
@@ -1382 +1387 @@
   && (res->RingDependend()))
   {
-    ssiSetCurrRing(d->r);
+    if(ssiSetCurrRing(d->r)) { d->r=currRing; d->r->ref++; }
   }
   return res;