kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/tk/tcltklib.c: fixed memory leak when tk_funcall raised

Browse source 
exception. (copies argv into heap in tk_funcall instead of
  caller)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ocean 2005-08-05 03:51:50 +00:00
parent 107e177cb8
commit 74d91a4c31
2 changed files with 23 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Aug 5 12:48:31 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/tk/tcltklib.c: fixed memory leak when tk_funcall raised
exception. (copies argv into heap in tk_funcall instead of
caller)
Fri Aug 5 12:36:40 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/mkmf.rb (create_makefile): need to convert path separetor

57
ext/tk/tcltklib.c
View file

@ -4540,19 +4540,14 @@ ip_thread_vwait(self, var)
VALUE self;
VALUE var;
{
VALUE *argv;
VALUE argv[2];
VALUE retval;
volatile VALUE cmd_str = rb_str_new2("thread_vwait");
argv = ALLOC_N(VALUE, 2);
argv[0] = cmd_str;
argv[1] = var;
retval = ip_invoke_real(2, argv, self);
free(argv);
return retval;
return ip_invoke_real(2, argv, self);
}
static VALUE
@ -4561,20 +4556,15 @@ ip_thread_tkwait(self, mode, target)
VALUE mode;
VALUE target;
{
VALUE *argv;
VALUE argv[3];
VALUE retval;
volatile VALUE cmd_str = rb_str_new2("thread_tkwait");
argv = ALLOC_N(VALUE, 3);
argv[0] = cmd_str;
argv[1] = mode;
argv[2] = target;
retval = ip_invoke_real(3, argv, self);
free(argv);
return retval;
return ip_invoke_real(3, argv, self);
}
@ -5283,8 +5273,7 @@ ip_create_slave(argc, argv, self)
struct tcltkip *master = get_ip(self);
VALUE safemode;
VALUE name;
VALUE *callargv;
VALUE retval;
VALUE callargv[2];
/* ip is deleted? */
if (deleted_ip(master)) {
@ -5301,16 +5290,11 @@ ip_create_slave(argc, argv, self)
rb_secure(4);
}
callargv = ALLOC_N(VALUE, 2);
StringValue(name);
callargv[0] = name;
callargv[1] = safemode;
retval = tk_funcall(ip_create_slave_core, 2, callargv, self);
free(callargv);
return retval;
return tk_funcall(ip_create_slave_core, 2, callargv, self);
}
#if defined(MAC_TCL) || defined(__WIN32__)
@ -5796,6 +5780,13 @@ tk_funcall(func, argc, argv, obj)
thr_crit_bup = rb_thread_critical;
rb_thread_critical = Qtrue;
/* allocate memory (argv cross over thread : must be in heap) */
if (argv) {
VALUE *temp = ALLOC_N(VALUE, argc);
MEMCPY(temp, argv, VALUE, argc);
argv = temp;
}
/* allocate memory (keep result) */
alloc_done = (int*)ALLOC(int);
*alloc_done = 0;
@ -5836,6 +5827,7 @@ tk_funcall(func, argc, argv, obj)
/* get result & free allocated memory */
ret = RARRAY(result)->ptr[0];
free(alloc_done);
if (argv) free(argv);
Tcl_Release(callq);
@ -7046,15 +7038,9 @@ ip_invoke_real(argc, argv, interp)
{
VALUE v;
struct tcltkip *ptr; /* tcltkip data struct */
int i;
Tcl_CmdInfo info;
char *s;
int len;
int thr_crit_bup;
#if TCL_MAJOR_VERSION >= 8
Tcl_Obj **av = (Tcl_Obj **)NULL;
Tcl_Obj *resultPtr;
#else /* TCL_MAJOR_VERSION < 8 */
char **av = (char **)NULL;
#endif
@ -7390,21 +7376,18 @@ ip_get_variable2(self, varname, index, flag)
VALUE index;
VALUE flag;
{
VALUE *argv;
VALUE argv[3];
VALUE retval;
StringValue(varname);
if (!NIL_P(index)) StringValue(index);
argv = ALLOC_N(VALUE, 3);
argv[0] = varname;
argv[1] = index;
argv[2] = flag;
retval = tk_funcall(ip_get_variable2_core, 3, argv, self);
free(argv);
if (NIL_P(retval)) {
return rb_tainted_str_new2("");
} else {
@ -7527,14 +7510,13 @@ ip_set_variable2(self, varname, index, value, flag)
VALUE value;
VALUE flag;
{
VALUE *argv;
VALUE argv[4];
VALUE retval;
StringValue(varname);
if (!NIL_P(index)) StringValue(index);
StringValue(value);
argv = ALLOC_N(VALUE, 4);
argv[0] = varname;
argv[1] = index;
argv[2] = value;
@ -7542,8 +7524,6 @@ ip_set_variable2(self, varname, index, value, flag)
retval = tk_funcall(ip_set_variable2_core, 4, argv, self);
free(argv);
if (NIL_P(retval)) {
return rb_tainted_str_new2("");
} else {
@ -7604,21 +7584,18 @@ ip_unset_variable2(self, varname, index, flag)
VALUE index;
VALUE flag;
{
VALUE *argv;
VALUE argv[3];
VALUE retval;
StringValue(varname);
if (!NIL_P(index)) StringValue(index);
argv = ALLOC_N(VALUE, 3);
argv[0] = varname;
argv[1] = index;
argv[2] = flag;
retval = tk_funcall(ip_unset_variable2_core, 3, argv, self);
free(argv);
if (NIL_P(retval)) {
return rb_tainted_str_new2("");
} else {