Changeset 595145 in git for libpolys

Timestamp:

May 26, 2016, 10:48:10 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

c21def206345e194f51f5b0d9c86daf757b940f6

Parents:

181bf31ff3cd5591f8ad17307f4c78803ea11f4e

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2016-05-26 10:48:10+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2016-05-26 11:41:44+02:00

Message:

ring handling (allow NULL for undefined): fix tr. #764

File:

• libpolys/polys/monomials/ring.cc (modified) (3 diffs)

libpolys/polys/monomials/ring.cc

@@ -644 +644 @@
 char * rString(ring r)
 {
-  if (r!=NULL)
+  if ((r!=NULL)&&(r->cf!=NULL))
   {
     char *ch=rCharStr(r);
@@ -657 +657 @@
   }
   else
-    return omStrDup("NULL");
+    return omStrDup("undefined");
 }
 
@@ -1302 +1302 @@
 int rSum(ring r1, ring r2, ring &sum)
 {
+  if ((r1==NULL)||(r2==NULL)
+  ||(r1->cf==NULL)||(r2->cf==NULL))
+    return -1;
   if (r1==r2)
   {