Changeset 951177 in git for Singular

Timestamp:

Nov 10, 2016, 11:15:31 AM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

dfda213f61263ad8410b207a93bc8a2718a3edc0

Parents:

ebfa7a9d174387b333fddda2c3d8d1442a078310

Message:

fix: crash at defining proc in .lib and .so twice (LIB"gfan.lib";LIB"gfan.lib";)

Location:

Singular

Files:

• ipid.cc (modified) (1 diff)
• iplib.cc (modified) (1 diff)

Singular/ipid.cc

@@ -656 +656 @@
 {
   (pi->ref)--;
-  if (pi->ref <= 0)
+  if (pi->ref == 0)
   {
     if (pi->language==LANG_SINGULAR)

Singular/iplib.cc

@@ -926 +926 @@
   {
     pi = IDPROC(h);
-    omfree(pi->libname);
-    pi->libname = omStrDup(libname);
-    omfree(pi->procname);
-    pi->procname = omStrDup(procname);
-    pi->language = LANG_C;
-    pi->ref = 1;
-    pi->is_static = pstatic;
-    pi->data.o.function = func;
+    if((pi->language == LANG_SINGULAR)
+    ||(pi->language == LANG_NONE))
+    {
+      omfree(pi->libname);
+      pi->libname = omStrDup(libname);
+      omfree(pi->procname);
+      pi->procname = omStrDup(procname);
+      pi->language = LANG_C;
+      pi->ref = 1;
+      pi->is_static = pstatic;
+      pi->data.o.function = func;
+    }
+    else if(pi->language == LANG_C)
+    {
+      if(pi->data.o.function == func)
+      {
+        pi->ref++;
+      }
+      else
+      {
+        omfree(pi->libname);
+        pi->libname = omStrDup(libname);
+        omfree(pi->procname);
+        pi->procname = omStrDup(procname);
+        pi->language = LANG_C;
+        pi->ref = 1;
+        pi->is_static = pstatic;
+        pi->data.o.function = func;
+      }
+    }
+    else
+      Warn("internal error: unknown procedure type %d",pi->language);
     return(1);
   }