Add better error handling and make the delegation work with cloning.

1 files changed, 12 insertions, 2 deletions

diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c
index 54115e0..13c98f4 100644
--- a/generic/tclOOBasic.c
+++ b/generic/tclOOBasic.c
@@ -122,7 +122,7 @@ TclOO_Class_Constructor(
     Tcl_IncrRefCount(invoke[1]);
     Tcl_IncrRefCount(invoke[2]);
     TclNRAddCallback(interp, DecrRefsPostClassConstructor,
-	    invoke, NULL, NULL, NULL);
+	    invoke, oPtr, NULL, NULL);
 
     /*
      * Tricky point: do not want the extra reported level in the Tcl stack
@@ -139,16 +139,26 @@ DecrRefsPostClassConstructor(
     int result)
 {
     Tcl_Obj **invoke = data[0];
+    Object *oPtr = data[1];
     Tcl_InterpState saved;
+    int code;
 
     TclDecrRefCount(invoke[0]);
+    TclDecrRefCount(invoke[1]);
     TclDecrRefCount(invoke[2]);
     invoke[0] = Tcl_NewStringObj("::oo::MixinClassDelegates", -1);
+    invoke[1] = TclOOObjectName(interp, oPtr);
     Tcl_IncrRefCount(invoke[0]);
+    Tcl_IncrRefCount(invoke[1]);
     saved = Tcl_SaveInterpState(interp, result);
-    Tcl_EvalObjv(interp, 2, invoke, 0);
+    code = Tcl_EvalObjv(interp, 2, invoke, 0);
+    TclDecrRefCount(invoke[0]);
     TclDecrRefCount(invoke[1]);
     ckfree(invoke);
+    if (code != TCL_OK) {
+	Tcl_DiscardInterpState(saved);
+	return code;
+    }
     return Tcl_RestoreInterpState(interp, saved);
 }