Changeset 8b1af6 in git for libpolys/polys/monomials/ring.cc

Timestamp:

Nov 6, 2013, 2:30:52 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

93fc820b11e13b03357f9d05061a1954e37d658c

Parents:

75761633171290fa9ee90c7fc19a9d9bfba3534911ab4e8595e6e90a6b646949f46d516f88a72015

Message:

Merge pull request #389 from jankoboehm/spielwiese

Gerhards fix for zeroRad und some typos

File:

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

libpolys/polys/monomials/ring.cc

@@ -53 +53 @@
 
 omBin sip_sring_bin = omGetSpecBin(sizeof(ip_sring));
+omBin char_ptr_bin =  omGetSpecBin(sizeof(char*));
+
 
 static const char * const ringorder_name[] =
@@ -729 +731 @@
 char * rString(ring r)
 {
-  char *ch=rCharStr(r);
-  char *var=rVarStr(r);
-  char *ord=rOrdStr(r);
-  char *res=(char *)omAlloc(strlen(ch)+strlen(var)+strlen(ord)+9);
-  sprintf(res,"(%s),(%s),(%s)",ch,var,ord);
-  omFree((ADDRESS)ch);
-  omFree((ADDRESS)var);
-  omFree((ADDRESS)ord);
-  return res;
+  if (r!=NULL)
+  {
+    char *ch=rCharStr(r);
+    char *var=rVarStr(r);
+    char *ord=rOrdStr(r);
+    char *res=(char *)omAlloc(strlen(ch)+strlen(var)+strlen(ord)+9);
+    sprintf(res,"(%s),(%s),(%s)",ch,var,ord);
+    omFree((ADDRESS)ch);
+    omFree((ADDRESS)var);
+    omFree((ADDRESS)ord);
+    return res;
+  }
+  else
+    return omStrDup("NULL");
 }