Changeset 393651 in git

Timestamp:

Sep 14, 2011, 2:25:11 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

b4c4621d96ff1254191adfbbb46e66c45a69accb

Parents:

7de030d8205f4768cb8830522b1f724a624be130

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-09-14 14:25:11+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:47+01:00

Message:

fix: creation of ring (0,a),x,dp

File:

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

Singular/ipshell.cc

@@ -4950 +4950 @@
   
   coeffs cf=NULL;
+  // allocated ring
+  R = (ring) omAlloc0Bin(sip_sring_bin);
 
   if (pn->Typ()==INT_CMD)
@@ -4975 +4977 @@
       pn=pn->next;
       if (cf==NULL) cf=nInitChar(n_transExt,NULL);
+      if (cf==NULL) goto rInitError;
       R->cf=cf;
       if (pn!=NULL)
@@ -5109 +5112 @@
     cf=nInitChar(n_Zp, (void*)(long)ch);
   }
-  // allocated ring and set ch
-  R = (ring) omAlloc0Bin(sip_sring_bin);
   R->cf=cf;
 #ifdef HAVE_RINGS
@@ -5175 +5176 @@
   // error case:
   rInitError:
-  if  (R != NULL) rDelete(R);
+  if  ((R != NULL)&&(R->cf!=NULL)) rDelete(R);
   if (pn != NULL) pn->CleanUp();
   if (rv != NULL) rv->CleanUp();