Changeset a1f80b in git

Timestamp:

Dec 18, 2014, 1:31:07 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'd0474371d8c5d8068ab70bfb42719c97936b18a6')

Children:

20863c905e3e6d10e3e1e6de5a625a88d4ba28b2

Parents:

6b11c4c31a9405d61763d6cdb3862a3fac462317

Message:

chg: FETCH_M: tests etc.

File:

• Singular/iparith.cc (modified) (4 diffs)

Singular/iparith.cc

@@ -6878 +6878 @@
   if ((perm_var_l->Typ()!=INTVEC_CMD)
   ||((perm_par_l!=NULL)&&(perm_par_l->Typ()!=INTVEC_CMD))
-  ||(u->Typ()!=RING_CMD))
+  ||((u->Typ()!=RING_CMD)&&(u->Typ()!=QRING_CMD)))
   {
     WerrorS("fetch(<ring>,<name>[,<intvec>[,<intvec>])");
@@ -6916 +6916 @@
     else
       par_perm_size=rPar(r);
-    perm=(int *)omAlloc0((r->N+1)*sizeof(int));
+    perm=(int *)omAlloc0((rVar(r)+1)*sizeof(int));
     if (par_perm_size!=0)
       par_perm=(int *)omAlloc0(par_perm_size*sizeof(int));
@@ -6930 +6930 @@
       else
       {
-        for(i=si_min(rPar(r),rPar(currRing))-1;i>=0;i--)
+        for(i=rPar(r)-1;i>=0;i--)
         {
           if (i<perm_par_v->length()) par_perm[i]=(*perm_par_v)[i];
+          if ((par_perm[i]<-rPar(currRing))
+          || (par_perm[i]>rVar(currRing)))
+          {
+            Warn("invalid entry for par %d: %d\n",i,par_perm[i]);
+            par_perm[i]=0;
+          }
         }
       }
     }
-    for(i=si_min(rVar(r),rVar(currRing))-1;i>=0;i--)
+    for(i=rVar(r)-1;i>=0;i--)
     {
       if (i<perm_var_v->length()) perm[i+1]=(*perm_var_v)[i];
+      if ((perm[i]<-rPar(currRing))
+      || (perm[i]>rVar(currRing)))
+      {
+        Warn("invalid entry for var %d: %d\n",i,perm[i]);
+        perm[i]=0;
+      }
     }
     if (BVERBOSE(V_IMAP))
     {
-      for(i=1;i<=si_min(r->N,currRing->N);i++)
+      for(i=1;i<=si_min(rVar(r),rVar(currRing));i++)
       {
         if (perm[i]>0)
           Print("// var nr %d: %s -> var %s\n",i,r->names[i-1],currRing->names[perm[i]-1]);
-        else if (perm[i]<0)
+        else if (perm[i]<0)
           Print("// var nr %d: %s -> par %s\n",i,r->names[i-1],rParameter(currRing)[-perm[i]-1]);
       }
@@ -6970 +6982 @@
     }
     if (perm!=NULL)
-      omFreeSize((ADDRESS)perm,(r->N+1)*sizeof(int));
+      omFreeSize((ADDRESS)perm,(rVar(r)+1)*sizeof(int));
     if (par_perm!=NULL)
       omFreeSize((ADDRESS)par_perm,par_perm_size*sizeof(int));