summaryrefslogtreecommitdiffstats
path: root/gc.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-03-23 10:55:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-03-23 10:55:39 +0000
commitb86c04ff1366bf9fb4cba49de3bb6bd68299171a (patch)
treeb80d20a7cf42c56528dd53f3ebe1e739d057bd53 /gc.c
parentbc3e9033a1449fa0c1e812a7be3317e98358c137 (diff)
downloadruby-b86c04ff1366bf9fb4cba49de3bb6bd68299171a.tar.gz
ruby-b86c04ff1366bf9fb4cba49de3bb6bd68299171a.tar.xz
ruby-b86c04ff1366bf9fb4cba49de3bb6bd68299171a.zip
* gc.c (rb_gc_call_finalizer_at_exit): use free() if dfree is -1.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r--gc.c7
1 files changed, 6 insertions, 1 deletions
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;