Changeset 1b078e in git

Timestamp:

Aug 27, 2010, 4:48:16 PM (13 years ago)

Author:

Martin Lee <mlee@…>

Branches:

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

Children:

7f7b2ae08d4ef302906c949966fc7a88fe8d895f

Parents:

a5cd69539ad1429c09a8881386628bbf8d1fc2fc

git-author:

Martin Lee <mlee@fifi.mathematik.uni-kl.de>2010-08-27 16:48:16+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:28+01:00

Message:

assumes and Werrors added, test gives a seg fault

Location:

coeffs

Files:

• ffields.cc (modified) (3 diffs)
• test.cc (modified) (1 diff)

coeffs/ffields.cc

@@ -21 +21 @@
 //unsigned short *nfPlus1Table=NULL; /* the table i=log(z^i) -> log(z^i+1) */
 
+const double sixteenlog2= 11.09035489;
 /* the q's from the table 'fftable' */
 unsigned short fftable[]={
@@ -612 +613 @@
     /*this field is already set*/  return;
   int i=0;
-  while ((fftable[i]!=c) && (fftable[i]!=0)) i++;
+  
+  while ((fftable[i]!=c) && (fftable[i]!=0)) 
+    i++;
+  
   if (fftable[i]==0)
+  {
+    Werror("illegal GF-table size: %d", c);
     return;
+  }
+
   if (r->m_nfCharQ > 1)
   {
@@ -839 +847 @@
   r->has_simple_Alloc=TRUE;
   r->has_simple_Inverse=TRUE;
-  const int c = pow (p->GFChar, p->GFDegree);
+
+  assume (p->GFChar > 0);
+  assume (p->GFDegree > 0);
+
+  if(p->GFChar > (2<<15))
+  {
+    Werror("illegal characteristic"); // no exceptions :(((
+    return;
+  }
+
+  const double check= log ((double) (p->GFChar)); 
+
+  if( (p->GFDegree * check) > sixteenlog2 )
+  {
+    Werror("illegal size");
+    return;
+  }
+
+  int c = pow (p->GFChar, p->GFDegree);
+
   nfReadTable(c, r);
+
+  assume (r -> m_nfCharQ > 0);
+
   r->ch = r->m_nfCharP; 
 

coeffs/test.cc

@@ -282 +282 @@
 
    param.GFChar= 5;
-   param.GFDegree= 2;
+   param.GFDegree= 12;
 
    param.GFPar_name= (const char*)"q";