1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/tk/tcltklib.c (ip_finalize): better modification than the

Browse Source 
previous commit [ruby-dev:26029].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagai 2005-04-12 06:37:10 +00:00
parent b346101b25
commit c594a95a57
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Apr 12 15:33:09 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tcltklib.c (ip_finalize): better modification than the
previous commit [ruby-dev:26029].
Tue Apr 12 12:38:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Tue Apr 12 12:38:06 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval() * ext/tk/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval()

44
ext/tk/tcltklib.c
View File

@ -115,6 +115,36 @@ static VALUE ip_invoke _((int, VALUE*, VALUE));
static VALUE tk_funcall _((VALUE(), int, VALUE*, VALUE)); 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
/* from tkAppInit.c */ /* from tkAppInit.c */
#if TCL_MAJOR_VERSION < 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4) #if TCL_MAJOR_VERSION < 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4)
@ -4420,22 +4450,12 @@ ip_finalize(ip)
Tcl_GlobalEval(ip, finalize_hook_name); Tcl_GlobalEval(ip, finalize_hook_name);
} }
DUMP1("cancel after callbacks");
#define AFTER_CANCEL_CMD "foreach id [after info] {after cancel $id}"
DUMP1("check `foreach' & `after'"); DUMP1("check `foreach' & `after'");
if ( Tcl_GetCommandInfo(ip, "foreach", &info) if ( Tcl_GetCommandInfo(ip, "foreach", &info)
&& Tcl_GetCommandInfo(ip, "after", &info) ) { && Tcl_GetCommandInfo(ip, "after", &info) ) {
char *cmd; DUMP1("cancel after callbacks");
if ((cmd = Tcl_Alloc(strlen(AFTER_CANCEL_CMD) + 1)) == (char*)NULL) { Tcl_GlobalEval(ip, "foreach id [after info] {after cancel $id}");
DUMP1("cancel after callbacks : cannot allocate memory");
} else {
DUMP1("call `foreach' & `after'");
strcpy(cmd, AFTER_CANCEL_CMD);
Tcl_GlobalEval(ip, cmd);
Tcl_Free(cmd);
}
} }
#undef AFTER_CANCEL_CMD
Tcl_Release(ip); Tcl_Release(ip);