Changeset 807ee2 in git

Timestamp:

Apr 8, 2010, 6:40:40 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f91fddc43db014d7355e8386a068d0a3772d2dcd

Parents:

de978257b14a5a05113613fd42f27ec97bc80295

Message:

nc-mult: memory leak fixed

git-svn-id: file:///usr/local/Singular/svn/trunk@12715 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/gring.cc (modified) (3 diffs)

kernel/gring.cc

@@ -1004 +1004 @@
   for (k=2;k<=a;k++)
   {
-     t = nc_p_CopyGet(MATELEM(cMT,k,1),r);
+     t = MATELEM(cMT,k,1);
 
      if (t==NULL)   /* not computed yet */
@@ -1020 +1020 @@
   for (m=2;m<=b;m++)
   {
-    t = nc_p_CopyGet(MATELEM(cMT,a,m),r);
+    t = MATELEM(cMT,a,m);
     //     t=MATELEM(cMT,a,m);
     if (t==NULL)   //not computed yet
@@ -2787 +2787 @@
       for (j=i+1; j<=rN; j++)
       {
-    if (ExpVar[j]==0)
-    {
-      test = MATELEM(r->GetNC()->D,i,j);
-      while (test!=NULL)
-      {
+        if (ExpVar[j]==0)
+        {
+          test = MATELEM(r->GetNC()->D,i,j);
+          while (test!=NULL)
+          {
             p_GetExpV(test, ExpTmp, r);
-        OK=1;
-        for (k=1;k<=rN;k++)
+            OK=1;
+            for (k=1;k<=rN;k++)
             {
-          if (ExpTmp[k]!=0)
-          {
-        if (ExpVar[k]!=0) OK=0;
+              if (ExpTmp[k]!=0)
+              {
+                if (ExpVar[k]!=0) OK=0;
+              }
+            }
+            if (!OK)
+            {
+              if ( WeChangeRing )
+                rChangeCurrRing(save);
+              return(TRUE);
+            }
+            pIter(test);
           }
-            }
-        if (!OK) return(TRUE);
-        pIter(test);
-          }
-    }
+        }
       }
     }