Changeset c8e7d63 in git

Timestamp:

Feb 25, 2014, 9:57:35 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4cda398594e14a9c3953996550f1d55f247252fc8d25019f8182d6d3e441f78f8146914b302f82f3

Parents:

42d0cbc2182023ac298b5fcbc4fefb38d67e2aac

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-02-25 09:57:35+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-02-25 09:59:37+01:00

Message:

fix: setting minpoly twice with invalid minpolys (tr.579)

Files:

• Singular/ipassign.cc (modified) (1 diff)
• libpolys/polys/ext_fields/algext.cc (modified) (1 diff)

Singular/ipassign.cc

@@ -248 +248 @@
   }
 
-  assume( currRing->cf->extRing->qideal == NULL );
-
   AlgExtInfo A;
 
   A.r = rCopy(currRing->cf->extRing); // Copy  ground field!
+  // if minpoly was already set:
+  if( currRing->cf->extRing->qideal != NULL ) id_Delete(&(A.r->qideal),A.r);
   ideal q = idInit(1,1);
+  if ((p==NULL) ||(DEN((fraction)(p)) != NULL) ||(NUM((fraction)p)==NULL))
+  {
+    Werror("Could not construct the alg. extension: minpoly==0");
+    // cleanup A: TODO
+    rDelete( A.r );
+    return TRUE;
+  }
 
   assume( DEN((fraction)(p)) == NULL ); // minpoly must be a fraction with poly numerator...!!

libpolys/polys/ext_fields/algext.cc

@@ -653 +653 @@
   poly aAsPoly;
   const char * result = p_Read(s, aAsPoly, naRing);
-  definiteReduce(aAsPoly, naMinpoly, cf);
+  if (aAsPoly!=NULL) definiteReduce(aAsPoly, naMinpoly, cf);
   *a = (number)aAsPoly;
   return result;