Changeset 80d8d6 in git

Timestamp:

Sep 11, 2013, 11:27:24 AM (10 years ago)

Author:

Andreas Steenpass <steenpass@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

8f64a0f3ad9365d434e4711de3c37e54e27f770e

Parents:

a7814c2a0fe2f2a1abe1643ed8afdd5b21ecef8b

git-author:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-09-11 11:27:24+02:00

git-committer:

Andreas Steenpass <steenpass@mathematik.uni-kl.de>2013-09-11 11:47:21+02:00

Message:

chg: port commit e9da36a from master to spielwiese

commit hash in master: e9da36afd8cdf7d84cd5f977ba1d25e86584165b
was: 'chg: in slCleanUp(), kill the link before freeing the memory'

File:

• Singular/links/silink.cc (modified) (1 diff)

Singular/links/silink.cc

@@ -136 +136 @@
     if (SI_LINK_OPEN_P(l))
     {
-      if (l->m->Kill != NULL) l->m->Kill(l);
-      else if (l->m->Close != NULL) l->m->Close(l);
-    }
+      if (l->m->Close != NULL) l->m->Close(l);
+    }
+    if ((l->data != NULL) && (l->m->Kill != NULL)) l->m->Kill(l);
     omFree((ADDRESS)l->name);
     omFree((ADDRESS)l->mode);