Changeset 879e4c in git

Timestamp:

Oct 15, 2015, 3:47:11 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

2d265b2596f3ebb9c7b09c216ebe2faa2638f2d5

Parents:

5fd2b1e537aec892b174f98c27dc1c56397fcba2

Message:

memory still leaks

Location:

kernel/GBEngine

Files:

• kstd1.cc (modified) (2 diffs)
• kutil.cc (modified) (12 diffs)

kernel/GBEngine/kstd1.cc

@@ -415 +415 @@
       // over ZZ: cleanup coefficients by complete reduction with monomials
       postReduceByMon(h, strat);
-      if(nIsZero(pGetCoeff(h->p)) || h->p == NULL) return 2;
+      if(h->p == NULL) 
+      {
+        if (h->lcm!=NULL) pLmDelete(h->lcm);
+        h->Clear();
+        return 0;
+      }
       if(strat->tl >= 0)
           h->i_r1 = strat->tl;
@@ -1200 +1205 @@
       if (pLmCmp(strat->L[i].p,strat->kNoether) == -1)
       {
-        pLmFree(strat->L[i].p);
+        #ifdef HAVE_RINGS
+        if (rField_is_Ring(currRing))
+          pLmDelete(strat->L[i].p);
+        else
+        #endif
+          pLmFree(strat->L[i].p);
         strat->L[i].p = NULL;
       }
       else
       {
-        pLmFree(strat->L[i].p);
+        #ifdef HAVE_RINGS
+        if (rField_is_Ring(currRing))
+          pLmDelete(strat->L[i].p);
+        else
+        #endif
+          pLmFree(strat->L[i].p);
         strat->L[i].p = NULL;
         poly m1 = NULL, m2 = NULL;

kernel/GBEngine/kutil.cc

@@ -375 +375 @@
           pSetCoeff(L->p,eins);
           if (L->t_p != NULL)
-            pSetCoeff0(L->t_p,eins);
+            pSetCoeff(L->t_p,eins);
         }
         else
@@ -1397 +1397 @@
     }
   #else
-  assume(i<=strat->sl);
   assume(atR >= 0);
   assume(i<=strat->sl);
+  assume(p!=NULL);
   int      l,j,compare,compareCoeff;
   LObject  h;
@@ -1544 +1544 @@
   #endif
   number s, t;
-  poly m1, m2, gcd;
+  poly m1, m2, gcd = NULL;
   #if ADIDEBUG
   printf("\nTrying to add spair S[%i] und p\n",i);pWrite(strat->S[i]);pWrite(p);
@@ -1554 +1554 @@
   pSetCoeff0(m1, s);
   pSetCoeff0(m2, t);
-  pNeg(m2);
+  m2 = pNeg(m2);
   p_Test(m1,strat->tailRing);
   p_Test(m2,strat->tailRing);
@@ -1563 +1563 @@
   if(sim2 == NULL)
   {
+    pDelete(&m1);
+    pDelete(&m2);
     if(pm1 == NULL)
     {
-      //pDelete(&sim2);
-      //pDelete(&pm1);
-      //pDelete(&gcd);
-      //pDelete(&m1);
-      //pDelete(&m2);
       return;
     }
     else
     {
-      gcd = pCopy(pm1);
-      pDelete(&pm1);
-      pDelete(&sim2);
-      pDelete(&m1);
-      pDelete(&m2);
+      gcd = pm1;
+      pm1 = NULL;
     }
   }
@@ -2371 +2365 @@
     pDelete(&pSigMult);
     pDelete(&sSigMult);
-    pLmFree(Lp.lcm);
+    #ifdef HAVE_RINGS
+    if (rField_is_Ring(currRing))
+      pLmDelete(Lp.lcm);
+    else
+    #endif
+      pLmFree(Lp.lcm);
     Lp.lcm=NULL;
     pDelete (&m1);
@@ -2387 +2386 @@
     pDelete(&pSigMult);
     pDelete(&sSigMult);
-    pLmFree(Lp.lcm);
+    #ifdef HAVE_RINGS
+    if (rField_is_Ring(currRing))
+      pLmDelete(Lp.lcm);
+    else
+    #endif
+      pLmFree(Lp.lcm);
     Lp.lcm=NULL;
     pDelete (&m1);
@@ -9100 +9104 @@
     return TRUE;
   }
-  pLmFree(newNoether);
+  #ifdef HAVE_RINGS
+  if (rField_is_Ring(currRing))
+    pLmDelete(newNoether);
+  else
+  #endif
+    pLmFree(newNoether);
   return FALSE;
 }
@@ -9359 +9368 @@
         if(pLmDivisibleBy(strat->S[i], p))
         {
-          p->coef = currRing->cf->cfIntMod(p->coef, strat->S[i]->coef, currRing->cf);
+          number dummy = n_IntMod(p->coef, strat->S[i]->coef, currRing->cf);
+          p_SetCoeff(p,dummy,currRing);
         }
         if(nIsZero(p->coef))
         {
-          pLmDelete(&pNext(p));
+          pLmDelete(&p);
           deleted = TRUE;
         }
@@ -9376 +9386 @@
         if(pLmDivisibleBy(strat->S[i], pp))
         {
-          pp->coef = currRing->cf->cfIntMod(pp->coef, strat->S[i]->coef, currRing->cf);
+          number dummy = n_IntMod(pp->coef, strat->S[i]->coef, currRing->cf);
+          p_SetCoeff(pp,dummy,currRing);
           if(nIsZero(pp->coef))
           {
@@ -9423 +9434 @@
           if(pLmDivisibleBy(strat->S[j], p))
           {
-            //nDelete(&(p->coef));
-            p->coef = currRing->cf->cfIntMod(p->coef, strat->S[j]->coef, currRing->cf);
+            number dummy = n_IntMod(p->coef, strat->S[j]->coef, currRing->cf);
+            p_SetCoeff(p,dummy,currRing);
           }
           pp = pNext(p); 
@@ -9437 +9448 @@
                 if(pLmDivisibleBy(strat->S[j], pp))
                 {
-                  //nDelete(&(pp->coef));
-                  pp->coef = currRing->cf->cfIntMod(pp->coef, strat->S[j]->coef, currRing->cf);
+                  number dummy = n_IntMod(pp->coef, strat->S[j]->coef, currRing->cf);
+                  p_SetCoeff(pp,dummy,currRing);
                   if(nIsZero(pp->coef))
                   {