Protect duplicate calls to obstack_free(), as obstack_free segfaults when

called without initializing.

diff --git a/ChangeLog b/ChangeLog
index 85189528d8186a33197169a77e636a567b11938b..06dcb94fa5950d19ce614e8c299091496bda40a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep  3 18:37:45 CDT 2002 Adam Heath <doogie@debian.org>
+
+  * lib/nfmalloc.c: Protect duplicate calls to obstack_free(),
+    as obstack_free segfaults when called without initializing.
+
 Tue Sep  3 18:36:42 CDT 2002 Adam Heath <doogie@debian.org>
 
   * version-nr, debian/changelog: Set 1.10.7 version.

diff --git a/lib/nfmalloc.c b/lib/nfmalloc.c
index 2930b88345eb6e1856c1cfcce85c1fed0f3508a9..f44d08c8a918c0c624162879f223c464d8b56a96 100644 (file)
--- a/lib/nfmalloc.c
+++ b/lib/nfmalloc.c
@@ -62,6 +62,8 @@ char *nfstrnsave(const char *string, int l) {
 }
 
 void nffreeall(void) {
-  obstack_free(&db_obs, NULL);
-  dbobs_init = 0;
+  if (dbobs_init) {
+    obstack_free(&db_obs, NULL);
+    dbobs_init = 0;
+  }
 }