1 files changed, 6 insertions, 1 deletions
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;