Changeset 6b02216 in git

Timestamp:

Jan 8, 2018, 2:26:25 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

601afa9526529f410b2b1c6caed7369d8c6c8ab0fbd9e6f0afef39d078d85fd25c80563f6b53084c

Parents:

ccc9976fe27edd5c59e8fdb762ab7310fe7bc55e

Message:

fix: overfow check in hilb (hFirstSeries): via WerrorS

Files:

• Singular/iparith.cc (modified) (2 diffs)
• kernel/combinatorics/hilb.cc (modified) (4 diffs)

Singular/iparith.cc

@@ -2303 +2303 @@
   intvec *module_w=(intvec*)atGet(u,"isHomog",INTVEC_CMD);
   intvec *iv=hFirstSeries((ideal)u->Data(),module_w,currRing->qideal);
+  if (errorreported) return TRUE;
+
   switch((int)(long)v->Data())
   {
@@ -5697 +5699 @@
   intvec *module_w=(intvec *)atGet(u,"isHomog",INTVEC_CMD);
   intvec *iv=hFirstSeries((ideal)u->Data(),module_w,currRing->qideal,wdegree);
+  if (errorreported) return TRUE;
+
   switch((int)(long)v->Data())
   {

kernel/combinatorics/hilb.cc

@@ -111 +111 @@
   memcpy(pon, pol, l * sizeof(int));
   if (l > x)
-  {
+  {/*pon[i] -= pol[i - x];*/
     for (i = x; i < l; i++)
-      pon[i] -= pol[i - x];
+    { int64 t=pon[i];
+      int64 t2=pol[i - x];
+      t-=t2;
+      if ((t>=INT_MIN)&&(t<=INT_MAX)) pon[i]=t;
+      else if (!errorreported) WerrorS("int overflow in hilb 1");
+    }
     for (i = l; i < ln; i++)
-      pon[i] = -pol[i - x];
+    { /*pon[i] = -pol[i - x];*/
+      int64 t= -pol[i - x];
+      if ((t>=INT_MIN)&&(t<=INT_MAX)) pon[i]=t;
+      else if (!errorreported) WerrorS("int overflow in hilb 2");
+    }
   }
   else
@@ -142 +151 @@
   j = Q0[Nv + 1];
   for (i = 0; i < l; i++)
-    pl[i + j] += p[i];
+  { /* pl[i + j] += p[i];*/
+    int64 t=pl[i+j];
+    int64 t2=p[i];
+    t+=t2;
+    if ((t>=INT_MIN)&&(t<=INT_MAX)) pl[i+j]=t;
+    else if (!errorreported) WerrorS("int overflow in hilb 3");
+  }
   x = pure[var[1]];
   if (x!=0)
@@ -148 +163 @@
     j += x;
     for (i = 0; i < l; i++)
-      pl[i + j] -= p[i];
+    { /* pl[i + j] -= p[i];*/
+      int64 t=pl[i+j];
+      int64 t2=p[i];
+      t-=t2;
+      if ((t>=INT_MIN)&&(t<=INT_MAX)) pl[i+j]=t;
+      else if (!errorreported) WerrorS("int overflow in hilb 4");
+    }
   }
   j += l;
@@ -1399 +1420 @@
 
   intvec *hseries1 = hFirstSeries(S, modulweight, Q, wdegree, tailRing);
+  if (errorreported) return;
 
   hPrintHilb(hseries1);