Fix bug when calling ref finalizers

Commit 21d7fc3 introduced a bug where the finalizer was freed too early Signed-off-by: Steve Bennett <steveb@workware.net.au>
msteveb · Dec 16, 2011 · 535ce8f · 535ce8f
1 parent 939bd44
commit 535ce8f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/jim.c b/jim.c
@@ -5173,6 +5173,8 @@ int Jim_Collect(Jim_Interp *interp)
                 objv[2] = refPtr->objPtr;
 
                 /* Drop the reference itself */
+                /* Avoid the finaliser being freed here */
+                Jim_IncrRefCount(objv[0]);
                 Jim_DeleteHashEntry(&interp->references, refId);
 
                 /* Call the finalizer. Errors ignored. */
@@ -5181,6 +5183,8 @@ int Jim_Collect(Jim_Interp *interp)
                 Jim_EvalObjVector(interp, 3, objv);
                 Jim_SetResult(interp, oldResult);
                 Jim_DecrRefCount(interp, oldResult);
+
+                Jim_DecrRefCount(interp, objv[0]);
             }
             else {
                 Jim_DeleteHashEntry(&interp->references, refId);

diff --git a/regtest.tcl b/regtest.tcl
@@ -196,6 +196,14 @@ catch {
 } msg
 puts "TEST 27 PASSED"
 
+# REGTEST 28
+# 16 Dec 2011 - ref count problem with finalizers
+catch {
+    ref x x [list dummy]
+    collect
+}
+puts "TEST 28 PASSED"
+
 # TAKE THE FOLLOWING puts AS LAST LINE
 
 puts "--- ALL TESTS PASSED ---"