1.1b9_26

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 4 deletions

diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c
index e144c5f082..7d2abb8e80 100644
--- a/ext/tcltklib/tcltklib.c
+++ b/ext/tcltklib/tcltklib.c
@@ -120,8 +120,9 @@ ip_ruby(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
     res = rb_rescue(rb_eval_string, (VALUE)argv[1], ip_eval_rescue, (VALUE)&failed);
     trap_immediate = old_trapflg;
 
+    Tcl_ResetResult(interp);
     if (failed) {
-	Tcl_AppendResult(interp, RSTRING(failed)->ptr, (char*)NULL);
+	Tcl_AppendResult(interp, STR2CSTR(failed), (char*)NULL);
 	return TCL_ERROR;
     }
 
@@ -130,12 +131,11 @@ ip_ruby(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
 	DUMP1("(rb_eval_string result) nil");
 	return TCL_OK;
     }
-    Check_Type(res, T_STRING);
 
     /* copy result to the tcl interpreter */
-    DUMP2("(rb_eval_string result) %s", RSTRING(res)->ptr);
+    DUMP2("(rb_eval_string result) %s", STR2CSTR(res));
     DUMP1("Tcl_AppendResult");
-    Tcl_AppendResult(interp, RSTRING(res)->ptr, (char *)NULL);
+    Tcl_AppendResult(interp, STR2CSTR(res), (char *)NULL);
 
     return TCL_OK;
 }