Changeset 9b4a332 in git

Timestamp:

Oct 23, 2009, 11:58:49 AM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

698fe42860f6adbfb03425b76fe4bc95dd89e1a6

Parents:

a388ae5c0bb2238bcecc75e032fb91a5a79c3b00

Message:

*hannes: handle nx0-intmat


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

Location:

kernel

Files:

• intvec.cc (modified) (3 diffs)
• intvec.h (modified) (2 diffs)

kernel/intvec.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: intvec.cc,v 1.5 2009-05-15 13:20:05 motsak Exp $ */
+/* $Id: intvec.cc,v 1.6 2009-10-23 09:58:49 Singular Exp $ */
 /*
 * ABSTRACT: class intvec: lists/vectors of integers
@@ -57 +57 @@
   col = c;
   int l = r*c;
-  if ((r>0) && (c>0))
+  if (l>0) /*(r>0) && (c>0) */
     v = (int *)omAlloc(sizeof(int)*l);
   else
@@ -72 +72 @@
 #ifndef OM_NDEBUG
   omCheckAddr((void *)this);
-  omCheckAddr((void *)v);
+  if (v!=NULL) omCheckAddr((void *)v);
 #endif
   StringSetS("");

kernel/intvec.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: intvec.h,v 1.8 2009-06-05 05:18:27 motsak Exp $ */
+/* $Id: intvec.h,v 1.9 2009-10-23 09:58:49 Singular Exp $ */
 /*
 * ABSTRACT: class intvec: lists/vectors of integers
@@ -36 +36 @@
     row = iv->rows();
     col = iv->cols();
-    v   = (int *)omAlloc(sizeof(int)*row*col);
-    for (int i=row*col-1;i>=0; i--)
+    if (row*col>0)
     {
-      v[i] = (*iv)[i];
+      v   = (int *)omAlloc(sizeof(int)*row*col);
+      for (int i=row*col-1;i>=0; i--)
+      {
+        v[i] = (*iv)[i];
+      }
     }
+    else v=NULL;
   }