Changeset 5ec9be in git for kernel/GBEngine

Timestamp:

Dec 8, 2021, 8:45:50 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

b88651a797221664e3ac3f76aa6416eb7d9d9e95

Parents:

a3c2d148f63eb8d89dc8e26eb3d09063b2fa6590

Message:

fix: memory leak in NF in LP case

File:

• kernel/GBEngine/kstd2.cc (modified) (4 diffs)

kernel/GBEngine/kstd2.cc

@@ -309 +309 @@
         if (j > strat->tl) return -1;
 #if defined(PDEBUG) || defined(PDIV_DEBUG)
-        if (p_LmShortDivisibleBy(T[j].p, sevT[j],p, not_sev, r))
+        if ((T[j].p!=NULL)
+        && p_LmShortDivisibleBy(T[j].p, sevT[j],p, not_sev, r))
         {
           if(n_DivBy(pGetCoeff(p), pGetCoeff(T[j].p), r->cf))
@@ -315 +316 @@
         }
 #else
-        if (!(sevT[j] & not_sev) &&
-          p_LmDivisibleBy(T[j].p, p, r))
+        if (!(sevT[j] & not_sev)
+        && (T[j].p!=NULL)
+        && p_LmDivisibleBy(T[j].p, p, r))
         {
           if(n_DivBy(pGetCoeff(p), pGetCoeff(T[j].p), r->cf))
@@ -331 +333 @@
         if (j > strat->tl) return -1;
 #if defined(PDEBUG) || defined(PDIV_DEBUG)
-        if (p_LmShortDivisibleBy(T[j].p, sevT[j],p, not_sev, r))
+        if ((T[j].p!=NULL)
+        && p_LmShortDivisibleBy(T[j].p, sevT[j],p, not_sev, r))
         {
           return j;
         }
 #else
-        if (!(sevT[j] & not_sev) &&
-          p_LmDivisibleBy(T[j].p, p, r))
+        if (!(sevT[j] & not_sev)
+        && (T[j].p!=NULL)
+        && p_LmDivisibleBy(T[j].p, p, r))
         {
           return j;
@@ -4617 +4621 @@
         for (int j = 0; j<=strat->tl; ++j)
         {
-          // this is like clearS in bba, but we reduce with elements from T, because it contains the shifts too
-          assume(strat->sevT[j] == pGetShortExpVector(strat->T[j].p));
-          assume(strat->sevS[k] == pGetShortExpVector(strat->S[k]));
-          if (pLmShortDivisibleBy(strat->T[j].p, strat->sevT[j], strat->S[k], ~strat->sevS[k]))
+          if (strat->T[j].p!=NULL)
           {
-            if (pLmCmp(strat->T[j].p, strat->S[k]) != 0)
-            { // check whether LM is different
-              deleteInS(k, strat);
-              --k;
-              break;
+            // this is like clearS in bba, but we reduce with elements from T, because it contains the shifts too
+            assume(strat->sevT[j] == pGetShortExpVector(strat->T[j].p));
+            assume(strat->sevS[k] == pGetShortExpVector(strat->S[k]));
+            if (pLmShortDivisibleBy(strat->T[j].p, strat->sevT[j], strat->S[k], ~strat->sevS[k]))
+            {
+              if (pLmCmp(strat->T[j].p, strat->S[k]) != 0)
+              { // check whether LM is different
+                deleteInS(k, strat);
+                --k;
+                break;
+              }
             }
           }