* gc.c (rb_gc_call_finalizer_at_exit): use free() if dfree is -1.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@3600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8a1539c74a..01956b4616 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 23 19:55:32 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): use free() if dfree is -1.
+
 Wed Mar 19 23:05:30 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>
 
 	* lib/tracer.rb (trace_func): save and recover Thread.critical state.
diff --git a/gc.c b/gc.c
index d78b69792d..12f210445a 100644
--- a/gc.c
+++ b/gc.c
@@ -1357,7 +1357,12 @@ rb_gc_call_finalizer_at_exit()
 	    if (BUILTIN_TYPE(p) == T_DATA &&
 		DATA_PTR(p) && RANY(p)->as.data.dfree) {
 		p->as.free.flag = 0;
-		(*RANY(p)->as.data.dfree)(DATA_PTR(p));
+		if ((long)RANY(p)->as.data.dfree == -1) {
+		    RUBY_CRITICAL(free(DATA_PTR(p)));
+		}
+		else if (RANY(p)->as.data.dfree) {
+		    (*RANY(p)->as.data.dfree)(DATA_PTR(p));
+		}
 	    }
 	    else if (BUILTIN_TYPE(p) == T_FILE) {
 		p->as.free.flag = 0;