archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-26 22:45:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merges r20460 from trunk into ruby_1_9_1.

Browse source 
* ext/tk/tcltklib.c (ip_ruby_cmd, ip_invoke_with_position): must
  not access internal union directly.  [ruby-list:45670]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-12-04 08:54:47 +00:00
parent 65616e8940
commit 857099f5b9
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ext/tk/tcltklib.c
View file

@ -3090,21 +3090,19 @@ ip_ruby_cmd(clientData, interp, argc, argv)
/* get args */
args = rb_ary_new2(argc - 2);
for(i = 3; i < argc; i++) {
VALUE s;
#if TCL_MAJOR_VERSION >= 8
str = Tcl_GetStringFromObj(argv[i], &len);
s = rb_tainted_str_new(str, len);
#else /* TCL_MAJOR_VERSION < 8 */
str = argv[i];
s = rb_tainted_str_new2(str);
#endif
DUMP2("arg:%s",str);
#ifndef HAVE_STRUCT_RARRAY_LEN
rb_ary_push(args, rb_tainted_str_new(str, len));
rb_ary_push(args, s);
#else
RARRAY(args)->as.heap.ptr[RARRAY(args)->as.heap.len++] = rb_tainted_str_new(str, len);
#endif
#else /* TCL_MAJOR_VERSION < 8 */
DUMP2("arg:%s",argv[i]);
#ifndef HAVE_STRUCT_RARRAY_LEN
rb_ary_push(args, rb_tainted_str_new2(argv[i]));
#else
RARRAY(args)->as.heap.ptr[RARRAY(args)->as.heap.len++] = rb_tainted_str_new2(argv[i]);
#endif
RARRAY(args)->ptr[RARRAY(args)->len++] = s;
#endif
}
@ -8295,7 +8293,7 @@ ip_invoke_with_position(argc, argv, obj, position)
DUMP2("back from handler (current thread:%lx)", current);
/* get result & free allocated memory */
ret = RARRAY(result)->as.heap.ptr[0];
ret = RARRAY_PTR(result)[0];
#if 0 /* use Tcl_EventuallyFree */
Tcl_EventuallyFree((ClientData)alloc_done, TCL_DYNAMIC); /* XXXXXXXX */
#else