Changeset 703ad1 in git

Timestamp:

Jun 7, 1999, 5:46:05 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

00b574855c4c3b834269f6a81fed2006d7408463

Parents:

d84e0ad8a53e2f96a962252957ddf9d3d579459b

Message:

* fixed syz1.cc:syConvList and iparitc.cc:jjL2R so that error in
  liFindRes is passed up to interpreter, i.e., that
ring r;
list l=r,37,l;
 resolution(l);

does not result in Segmentation fault


git-svn-id: file:///usr/local/Singular/svn/trunk@3094 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• iparith.cc (modified) (2 diffs)
• syz1.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.149 1999-06-04 13:07:30 pohl Exp $ */
+/* $Id: iparith.cc,v 1.150 1999-06-07 15:46:05 obachman Exp $ */
 
 /*
@@ -2698 +2698 @@
 {
   res->data=(char *)syConvList((lists)v->Data());
-  return FALSE;
+  if (res->data != NULL)
+    return FALSE;
+  else
+    return TRUE;
 }
 static BOOLEAN jjLEADCOEF(leftv res, leftv v)

Singular/syz1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: syz1.cc,v 1.36 1998-11-21 13:55:43 siebert Exp $ */
+/* $Id: syz1.cc,v 1.37 1999-06-07 15:46:02 obachman Exp $ */
 /*
 * ABSTRACT: resolutions
@@ -2440 +2440 @@
 
   resolvente fr = liFindRes(li,&(result->length),&typ0,&(result->weights));
-  result->fullres = (resolvente)Alloc0((result->length+1)*sizeof(ideal));
-  for (int i=result->length-1;i>=0;i--)
-  {
-    if (fr[i]!=NULL)
-      result->fullres[i] = idCopy(fr[i]);
-  }
-  result->list_length=result->length;
-  Free((ADDRESS)fr,(result->length)*sizeof(ideal));
+  if (fr != NULL)
+  {
+    
+    result->fullres = (resolvente)Alloc0((result->length+1)*sizeof(ideal));
+    for (int i=result->length-1;i>=0;i--)
+    {
+      if (fr[i]!=NULL)
+        result->fullres[i] = idCopy(fr[i]);
+    }
+    result->list_length=result->length;
+    Free((ADDRESS)fr,(result->length)*sizeof(ideal));
+  }
+  else
+  {
+    Free (result, sizeof(ssyStrategy));
+    result = NULL;
+  }
   if (toDel) li->Clean();
   return result;