Changeset cd2f5e in git

Timestamp:

Apr 7, 1998, 7:00:59 PM (25 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

49025e845fcf09ebb03e204de70d06ec1b8149f5

Parents:

c6564845a521c6c8ccc870c1a1c48eb9d26072c4

Message:

* hannes: fixed nasty memory-overwrite bug in kstdfac.cc


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

File:

• Singular/kstdfac.cc (modified) (14 diffs)

Singular/kstdfac.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstdfac.cc,v 1.14 1998-04-06 17:59:31 obachman Exp $ */
+/* $Id: kstdfac.cc,v 1.15 1998-04-07 17:00:59 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: factorizing alg. of Buchberger
@@ -258 +258 @@
       Print(" (=S[%d]) -> %d factors\n",si,IDELEMS(fac));
     }
+    else if (TEST_OPT_PROT)
+    {
+      int ii=IDELEMS(fac);
+      if (ii>1)
+      {
+        while(ii>0) { PrintS("F"); ii--; }
+      }
+    }
     ideal fac_copy=idInit(IDELEMS(fac),1);
     deleteInS(si,strat);
@@ -314 +322 @@
       if (IDELEMS(fac)>1)
       {
-        idTest(fac_copy);
-        idTest(n->D);
         if (n->D==NULL)
         {
@@ -323 +329 @@
         else
         {
+          idTest(n->D);
           ideal r=idAdd(n->D,fac_copy);
           idDelete(&n->D);
           n->D=r;
         }
-        idTest(n->D);
         if (TEST_OPT_DEBUG)
         {
@@ -334 +340 @@
           PrintLn();
         }
-        idTest(n->D);
-      }
-
-      idTest(fac_copy);
+      }
 
       fac_copy->m[i]=pCopy(fac->m[i]);
       fac->m[i]=NULL;
-
-      idTest(fac_copy);
 
       /* check for empty sets */
@@ -484 +485 @@
         Print("-> %d factors\n",IDELEMS(fac));
       }
+      else if (TEST_OPT_PROT)
+      {
+        int ii=IDELEMS(fac);
+        if (ii>1)
+        {
+          while(ii>0) { PrintS("F"); ii--; }
+        }
+      }
       if ((IDELEMS(fac)==1)&&(facdeg==pFDeg(fac->m[0])))
       {
@@ -514 +523 @@
         facdeg=pFDeg(fac->m[i]);
         ideal fac2=singclap_factorize(fac->m[i],NULL,1);
-#ifndef HAVE_LIBFAC_P 
+#ifndef HAVE_LIBFAC_P
         if ((fac2!=NULL)&&(IDELEMS(fac2)>1)&&(facdeg!=pFDeg(fac2->m[0])))
 #else
@@ -526 +535 @@
             //jjPRINT_MA0((matrix)fac2,"");
           }
+          else if (TEST_OPT_PROT)
+          {
+            int ii=IDELEMS(fac2);
+            if (ii>1)
+            {
+              while(ii>0) { PrintS("F"); ii--; }
+            }
+          }
           pDelete(&(fac->m[i]));
           fac->m[i]=fac2->m[0];
           pEnlargeSet(&(fac->m),IDELEMS(fac),IDELEMS(fac2)-1);
+          pEnlargeSet(&(fac_copy->m),IDELEMS(fac),IDELEMS(fac2)-1);
           memcpy(fac->m+IDELEMS(fac),&(fac2->m[1]),(IDELEMS(fac2)-1)*sizeof(poly
 ));
           IDELEMS(fac)+=(IDELEMS(fac2)-1);
+          IDELEMS(fac_copy)=IDELEMS(fac);
          }
       }
@@ -554 +573 @@
         else pos=posInS(n->S,n->sl,n->P.p);
         // we have already reduced all elements from fac....
-        //if (TEST_OPT_INTSTRATEGY)
+        //if (TEST_OPT_INTSTRATEGY)
         //{
         //  if (!TEST_OPT_MINRES||(n->syzComp==0)||(!n->homog))
@@ -590 +609 @@
         if (IDELEMS(fac)>1)
         {
-          idTest(fac_copy);
-          idTest(n->D);
           if (n->D==NULL)
           {
@@ -599 +616 @@
           else
           {
+            idTest(n->D);
             ideal r=idAdd(n->D,fac_copy);
             idDelete(&n->D);
             n->D=r;
           }
-          idTest(n->D);
           if (TEST_OPT_DEBUG)
           {
@@ -610 +627 @@
             PrintLn();
           }
-          idTest(n->D);
-        }
-
-        idTest(fac_copy);
+        }
 
         fac_copy->m[i]=pCopy(fac->m[i]);
         fac->m[i]=NULL;
-
-        idTest(fac_copy);
 
         /* check for empty sets */
@@ -652 +664 @@
           }
         }
+
         /* check for empty sets */
         {
@@ -810 +823 @@
             Print("empty set L[%d] because:L[%d]\n",j,i);
           }
-          // delete L[j], 
+          // delete L[j],
           i=0; j--;
-        }  
+        }
         else
         {