summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--gc.c7
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ac0cbce85..79892b0ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 23 19:54:53 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+
+ * gc.c (rb_gc_call_finalizer_at_exit): use free() if dfree is -1.
+
Sat Mar 22 15:50:29 2003 Tanaka Akira <akr@m17n.org>
* time.c (make_time_t): try search_time_t if mktime/timegm is failed.
diff --git a/gc.c b/gc.c
index 74ea83eac..6789c0d18 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;