Changeset c3b42b in git for Singular/iplib.cc

Timestamp:

Aug 13, 2004, 4:24:52 PM (20 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

e5627dd3d72ab05802168acf771823493696b8ef

Parents:

298d0a1b020f794c429af7513cc945ebe462e360

Message:

*hannes: NULL-deref


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

File:

• Singular/iplib.cc (modified) (2 diffs)

Singular/iplib.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iplib.cc,v 1.104 2003-11-04 16:43:29 Singular Exp $ */
+/* $Id: iplib.cc,v 1.105 2004-08-13 14:24:52 Singular Exp $ */
 /*
 * ABSTRACT: interpreter: LIB and help
@@ -489 +489 @@
       char *n;
       char *o;
-      if (iiLocalRing[myynest]!=NULL) o=rFindHdl(iiLocalRing[myynest],NULL, NULL)->id;
-      else                            o="none";
-      if (currRing!=NULL)             n=rFindHdl(currRing,NULL, NULL)->id;
-      else                            n="none";
+      idhdl nh=NULL, oh=NULL;
+      if (iiLocalRing[myynest]!=NULL)
+        oh=rFindHdl(iiLocalRing[myynest],NULL, NULL);
+      if (oh!=NULL)          o=oh->id;
+      else                   o="none";
+      if (currRing!=NULL)
+        nh=rFindHdl(currRing,NULL, NULL);
+      if (nh!=NULL)          n=nh->id;
+      else                   n="none";
       Werror("ring change during procedure call: %s -> %s",o,n);
       iiRETURNEXPR[myynest+1].CleanUp();