Changeset 703b5a3 in git

Timestamp:

Feb 5, 2002, 2:09:22 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

816fb200cf9ea3e46a9fe17b49e7a95c7189a48f

Parents:

28e0ac8cfc405def682d3274f90c18f7d6cc46f5

Message:

*hannes: fixed NULL deref


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

Location:

Singular

Files:

• fast_maps.cc (modified) (4 diffs)
• ipid.cc (modified) (2 diffs)

Singular/fast_maps.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 02/01
- *  Version: $Id: fast_maps.cc,v 1.28 2002-01-20 11:44:48 Singular Exp $
+ *  Version: $Id: fast_maps.cc,v 1.29 2002-02-05 13:09:05 Singular Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -322 +322 @@
   for (int i= 0; i < m_id->n; i++)
   {
-    sBucketDestroyAdd(m_id->buckets[i], &(res->m[i]), &l);
+    if (m_id->buckets[i]!=NULL)
+      sBucketDestroyAdd(m_id->buckets[i], &(res->m[i]), &l);
   }
   omFree(m_id);
@@ -375 +376 @@
   // do the optimization step
 #if HAVE_MAP_OPTIMIZE > 0
-  maPoly_Optimize(mp, src_r);
+  if (mp!=NULL) maPoly_Optimize(mp, src_r);
 #endif
   if (TEST_OPT_PROT)
@@ -395 +396 @@
   if (dest_r != image_r)
   {
-    if (no_sort)
-      res_image_id = idrShallowCopyR_NoSort(res_dest_id, dest_r, image_r);
-    else
+    //if (no_sort) see Old/m134si.tst
+    //  res_image_id = idrShallowCopyR_NoSort(res_dest_id, dest_r, image_r);
+    //else
       res_image_id = idrShallowCopyR(res_dest_id, dest_r, image_r);
     id_ShallowDelete(&res_dest_id, dest_r);

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.59 2002-02-04 12:06:53 Singular Exp $ */
+/* $Id: ipid.cc,v 1.60 2002-02-05 13:09:22 Singular Exp $ */
 
 /*
@@ -494 +494 @@
       while ((s!=h) && (s!=NULL)) s=s->next;
       if (s==NULL) killhdl2(h,&(currRing->idroot),currRing);
-      else killhdl2(h,&IDROOT,NULL);
+      else killhdl2(h,&IDROOT,currRing);
     }
 #endif /* HAVE_NAMESPACES */