From 100074c178ca336b3017f1d2564c70c32ac9d925 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 23 Mar 2003 10:55:39 +0000 Subject: * gc.c (rb_gc_call_finalizer_at_exit): use free() if dfree is -1. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ gc.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ac0cbce855..79892b0aba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Mar 23 19:54:53 2003 Nobuyoshi Nakada + + * gc.c (rb_gc_call_finalizer_at_exit): use free() if dfree is -1. + Sat Mar 22 15:50:29 2003 Tanaka Akira * time.c (make_time_t): try search_time_t if mktime/timegm is failed. diff --git a/gc.c b/gc.c index 74ea83eacd..6789c0d180 100644 --- a/gc.c +++ b/gc.c @@ -1547,7 +1547,12 @@ rb_gc_call_finalizer_at_exit() if (BUILTIN_TYPE(p) == T_DATA && DATA_PTR(p) && RANY(p)->as.data.dfree) { p->as.free.flags = 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.flags = 0; -- cgit v1.2.3