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

tkutil.c: prevent temporary objects from GC

Browse source 
* ext/tk/tkutil/tkutil.c: use rb_sprintf(), rb_id2str(), and
  rb_intern_str() instead of rb_intern() and RSTRING_PTR() with
  RB_GC_GUARD(), to prevent temporary objects from GC.
  [ruby-core:39000] [Bug #5199]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41351 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-06-17 07:59:55 +00:00
parent 6a986298a4
commit c2b7ae980e
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Mon Jun 17 16:59:53 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/tk/tkutil/tkutil.c: use rb_sprintf(), rb_id2str(), and
rb_intern_str() instead of rb_intern() and RSTRING_PTR() with
RB_GC_GUARD(), to prevent temporary objects from GC.
[ruby-core:39000] [Bug #5199]
Mon Jun 17 14:27:54 2013 Zachary Scott <zachary@zacharyscott.net> Mon Jun 17 14:27:54 2013 Zachary Scott <zachary@zacharyscott.net>
* vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1 * vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1

33
ext/tk/tkutil/tkutil.c
View file

@ -897,8 +897,7 @@ get_eval_string_core(obj, enc_flag, self)
} }
} }
rb_warning("fail to convert '%s' to string for Tk", rb_warning("fail to convert '%+"PRIsVALUE"' to string for Tk", obj);
RSTRING_PTR(rb_funcall(obj, rb_intern("inspect"), 0, 0)));
return obj; return obj;
} }
@ -1248,7 +1247,7 @@ each_attr_def(key, value, klass)
switch(TYPE(key)) { switch(TYPE(key)) {
case T_STRING: case T_STRING:
key_id = rb_intern(RSTRING_PTR(key)); key_id = rb_intern_str(key);
break; break;
case T_SYMBOL: case T_SYMBOL:
key_id = SYM2ID(key); key_id = SYM2ID(key);
@ -1260,7 +1259,7 @@ each_attr_def(key, value, klass)
switch(TYPE(value)) { switch(TYPE(value)) {
case T_STRING: case T_STRING:
value_id = rb_intern(RSTRING_PTR(value)); value_id = rb_intern_str(value);
break; break;
case T_SYMBOL: case T_SYMBOL:
value_id = SYM2ID(value); value_id = SYM2ID(value);
@ -1300,7 +1299,7 @@ cbsubst_sym_to_subst(self, sym)
VALUE sym; VALUE sym;
{ {
struct cbsubst_info *inf; struct cbsubst_info *inf;
const char *str; VALUE str;
char *buf, *ptr; char *buf, *ptr;
int idx; int idx;
long len; long len;
@ -1313,12 +1312,12 @@ cbsubst_sym_to_subst(self, sym)
struct cbsubst_info, inf); struct cbsubst_info, inf);
if (!NIL_P(ret = rb_hash_aref(inf->aliases, sym))) { if (!NIL_P(ret = rb_hash_aref(inf->aliases, sym))) {
str = rb_id2name(SYM2ID(ret)); str = rb_id2str(SYM2ID(ret));
} else { } else {
str = rb_id2name(SYM2ID(sym)); str = rb_id2str(SYM2ID(sym));
} }
id = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), str))); id = rb_intern_str(rb_sprintf("@%"PRIsVALUE, str));
for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) { for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
if (inf->ivar[idx] == id) break; if (inf->ivar[idx] == id) break;
@ -1355,7 +1354,7 @@ cbsubst_get_subst_arg(argc, argv, self)
VALUE self; VALUE self;
{ {
struct cbsubst_info *inf; struct cbsubst_info *inf;
const char *str; VALUE str;
char *buf, *ptr; char *buf, *ptr;
int i, idx; int i, idx;
long len; long len;
@ -1370,28 +1369,28 @@ cbsubst_get_subst_arg(argc, argv, self)
for(i = 0; i < argc; i++) { for(i = 0; i < argc; i++) {
switch(TYPE(argv[i])) { switch(TYPE(argv[i])) {
case T_STRING: case T_STRING:
str = RSTRING_PTR(argv[i]); str = argv[i];
arg_sym = ID2SYM(rb_intern(str)); arg_sym = ID2SYM(rb_intern_str(argv[i]));
break; break;
case T_SYMBOL: case T_SYMBOL:
arg_sym = argv[i]; arg_sym = argv[i];
str = rb_id2name(SYM2ID(arg_sym)); str = rb_id2str(SYM2ID(arg_sym));
break; break;
default: default:
rb_raise(rb_eArgError, "arg #%d is not a String or a Symbol", i); rb_raise(rb_eArgError, "arg #%d is not a String or a Symbol", i);
} }
if (!NIL_P(ret = rb_hash_aref(inf->aliases, arg_sym))) { if (!NIL_P(ret = rb_hash_aref(inf->aliases, arg_sym))) {
str = rb_id2name(SYM2ID(ret)); str = rb_id2str(SYM2ID(ret));
} }
id = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), str))); id = rb_intern_str(rb_sprintf("@%"PRIsVALUE, str));
for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) { for(idx = 0; idx < CBSUBST_TBL_MAX; idx++) {
if (inf->ivar[idx] == id) break; if (inf->ivar[idx] == id) break;
} }
if (idx >= CBSUBST_TBL_MAX) { if (idx >= CBSUBST_TBL_MAX) {
rb_raise(rb_eArgError, "cannot find attribute :%s", str); rb_raise(rb_eArgError, "cannot find attribute :%"PRIsVALUE, str);
} }
*(ptr++) = '%'; *(ptr++) = '%';
@ -1573,7 +1572,7 @@ cbsubst_table_setup(argc, argv, self)
subst_inf->full_subst_length += 3; subst_inf->full_subst_length += 3;
id = SYM2ID(RARRAY_PTR(inf)[2]); id = SYM2ID(RARRAY_PTR(inf)[2]);
subst_inf->ivar[chr] = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), rb_id2name(id)))); subst_inf->ivar[chr] = rb_intern_str(rb_sprintf("@%"PRIsVALUE, rb_id2str(id)));
rb_attr(self, id, 1, 0, Qtrue); rb_attr(self, id, 1, 0, Qtrue);
} }
@ -1612,7 +1611,7 @@ cbsubst_table_setup(argc, argv, self)
subst_inf->full_subst_length += (subst_inf->keylen[chr] + 2); subst_inf->full_subst_length += (subst_inf->keylen[chr] + 2);
id = SYM2ID(RARRAY_PTR(inf)[2]); id = SYM2ID(RARRAY_PTR(inf)[2]);
subst_inf->ivar[chr] = rb_intern(RSTRING_PTR(rb_str_cat2(rb_str_new2("@"), rb_id2name(id)))); subst_inf->ivar[chr] = rb_intern_str(rb_sprintf("@%"PRIsVALUE, rb_id2str(id)));
rb_attr(self, id, 1, 0, Qtrue); rb_attr(self, id, 1, 0, Qtrue);
} }