[ruby-dev:27647] Re: tcltkstub cause SEGV

Hidetoshi NAGAI <[e-mail]> wrote:
(2005/11/06 21:51)

>永井@知能．九工大です．
>
>From: Hidetoshi NAGAI <[e-mail]>
>Subject: [ruby-dev:27644] Re: tcltkstub cause SEGV
>Date: Sun, 6 Nov 2005 21:46:34 +0900
>Message-ID: <[e-mail]>
>> # ついでに [ruby-dev:27643] の修正もまとめて
>> # コミットしておいてもらえると助かるかなぁ
>> # とか言ってみたりして．(^_^;
>
>遅かった．．．(^_^;
>[ruby-dev:27643] の修正のコミットはこちらでやります．

いえ、現在作業中です。tcltklib.c にある tcl_eval を stubs.c に移動し、
stubs.h で置き換えるようにしようと思います。
（こうすれば tcltklib.c と stubs.c の両方で有効になるので）

Index: stubs.c
===================================================================
RCS file: /src/ruby/ext/tk/stubs.c,v
retrieving revision 1.4
diff -u -w -b -p -r1.4 stubs.c
--- stubs.c	6 Nov 2005 12:45:44 -0000	1.4
+++ stubs.c	6 Nov 2005 12:59:04 -0000
@@ -504,4 +504,24 @@ ruby_tcltk_stubs()
     return 0;
 }
 
+/*------------------------------*/
+
+static int
+ruby_tcl_eval(Tcl_Interp *interp, const char *cmd)
+{
+    char *buf = strdup(cmd); /* writable memory */
+    const int ret = Tcl_Eval(interp, buf);
+    free(buf);
+    return ret;
+}
+
+static int
+ruby_tcl_global_eval(Tcl_Interp *interp, const char *cmd)
+{
+    char *buf = strdup(cmd); /* writable memory */
+    const int ret = Tcl_GlobalEval(interp, buf);
+    free(buf);
+    return ret;
+}
+
 #endif
Index: stubs.h
===================================================================
RCS file: /src/ruby/ext/tk/stubs.h,v
retrieving revision 1.1
diff -u -w -b -p -r1.1 stubs.h
--- stubs.h	28 Jul 2005 09:14:57 -0000	1.1
+++ stubs.h	6 Nov 2005 13:00:00 -0000
@@ -10,6 +10,8 @@ extern int ruby_tcl_stubs_init();
 extern int ruby_tk_stubs_init(Tcl_Interp*);
 extern int ruby_tk_stubs_safeinit(Tcl_Interp*);
 extern int ruby_tcltk_stubs();
+extern int ruby_tcl_eval(Tcl_Interp *interp, const char *cmd);
+extern int ruby_tcl_global_eval(Tcl_Interp *interp, const char *cmd);
 
 /* no error */
 #define TCLTK_STUBS_OK     (0)
@@ -31,3 +33,9 @@ extern int ruby_tcltk_stubs();
 #define NO_Tk_Init         (7)
 #define FAIL_Tk_Init       (8)
 #define FAIL_Tk_InitStubs  (9)
+
+/* safe Tcl_Eval and Tcl_GlobalEval */
+#undef Tcl_Eval
+#define Tcl_Eval ruby_tcl_eval
+#undef Tcl_GlobalEval
+#define Tcl_GlobalEval ruby_tcl_global_eval
Index: tcltklib.c
===================================================================
RCS file: /src/ruby/ext/tk/tcltklib.c,v
retrieving revision 1.40
diff -u -w -b -p -r1.40 tcltklib.c
--- tcltklib.c	2 Nov 2005 10:06:29 -0000	1.40
+++ tcltklib.c	6 Nov 2005 12:50:47 -0000
@@ -120,35 +120,6 @@ static VALUE ip_invoke _((int, VALUE*, V
 
 static VALUE tk_funcall _((VALUE(), int, VALUE*, VALUE));
 
-/* safe Tcl_Eval and Tcl_GlobalEval */
-static int
-tcl_eval(interp, cmd)
-    Tcl_Interp *interp;
-    const char *cmd; /* don't have to be writable */
-{
-    char *buf = strdup(cmd);
-    const int ret = Tcl_Eval(interp, buf);
-    free(buf);
-    return ret;
-}
-
-#undef Tcl_Eval
-#define Tcl_Eval tcl_eval
-
-static int
-tcl_global_eval(interp, cmd)
-    Tcl_Interp *interp;
-    const char *cmd; /* don't have to be writable */
-{
-    char *buf = strdup(cmd);
-    const int ret = Tcl_GlobalEval(interp, buf);
-    free(buf);
-    return ret;
-}
-
-#undef Tcl_GlobalEval
-#define Tcl_GlobalEval tcl_global_eval
-
 /* Tcl_{Incr|Decr}RefCount for tcl7.x or earlier */
 #if TCL_MAJOR_VERSION < 8
 #define Tcl_IncrRefCount(obj) (1)