Changeset 7b9b0a2 in git

Timestamp:

Feb 2, 2010, 10:00:29 AM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f319f56b825b534ab7d932c0e0836e2b2c4a4a53

Parents:

eae4aa570178ab3f8608980b3baa77c859c0b30b

Message:

error message and memory clean for minor

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

File:

• Singular/iparith.cc (modified) (3 diffs)

Singular/iparith.cc

@@ -5991 +5991 @@
   leftv u=v->next;
   v->next=NULL;
-  if (v->Typ()==MATRIX_CMD)
+  int v_typ=v->Typ();
+  if (v_typ==MATRIX_CMD)
   {
      m = (const matrix)v->Data();
@@ -5997 +5998 @@
   else
   {
+    if (v_typ==0)
+    {
+      Werror("`%s` is undefined",v->Fullname());
+      return TRUE;
+    }
     // try to convert to MATRIX:
-    int ii=iiTestConvert(v->Typ(),MATRIX_CMD);
+    int ii=iiTestConvert(v_typ,MATRIX_CMD);
     BOOLEAN bo;
     sleftv tmp;
-    if (ii>0) bo=iiConvert(v->Typ(),MATRIX_CMD,ii,v,&tmp);
+    if (ii>0) bo=iiConvert(v_typ,MATRIX_CMD,ii,v,&tmp);
     else bo=TRUE;
     if (bo)
     { 
-      Werror("cannot convert %s to matrix",Tok2Cmdname(v->Typ()));
+      Werror("cannot convert %s to matrix",Tok2Cmdname(v_typ));
       return TRUE;
     }
@@ -6127 +6133 @@
   else
     res->data = getMinorIdeal(m, mk, (noK ? 0 : k), algorithm, (noIdeal ? 0 : IasSB), false);
+  if (v_typ!=MATRIX_CMD) idDelete((ideal *)&m);
   res->rtyp = IDEAL_CMD;
   return FALSE;