diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-24 05:53:43 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-24 05:53:43 +0000 |
| commit | a58bc70a0d668aced0ba2b461e22b9e652efdb2f (patch) | |
| tree | 49adb0e44abfd9d14f9c47517039e333bb98c50a /ext/tk | |
| parent | f83656efa43461862c0e19138940b4864eb52f2c (diff) | |
| download | ruby-a58bc70a0d668aced0ba2b461e22b9e652efdb2f.tar.gz ruby-a58bc70a0d668aced0ba2b461e22b9e652efdb2f.tar.xz ruby-a58bc70a0d668aced0ba2b461e22b9e652efdb2f.zip | |
* parse.y (rb_parser_append_print): should handle prelude.
[llama@u01.gate0]
* parse.y (rb_parser_while_loop): ditto.
* array.c (rb_ary_subseq): original object might be modified after
sharing data creation. [ruby-dev:24327]
* array.c (rb_ary_replace): ditto.
* array.c (ary_make_shared): freeze shared array. [ruby-dev:24325]
* struct.c (struct_members): always check struct size and size of
members list in the class. [ruby-dev:24320]
* string.c (rb_str_sub_bang): check if string is not modified
during iteration. [ruby-dev:24315]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
| -rw-r--r-- | ext/tk/tkutil.c | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/ext/tk/tkutil.c b/ext/tk/tkutil.c index 0595207fe..c0dc48e59 100644 --- a/ext/tk/tkutil.c +++ b/ext/tk/tkutil.c @@ -197,15 +197,26 @@ fromUTF8_toDefaultEnc(str, self) } +static void +hash_check(err) + int err; +{ + if (err) { + rb_raise(rb_eRuntimeError, "hash modified"); + } +} + static int -to_strkey(key, value, hash) +to_strkey(key, value, hash, err) VALUE key; VALUE value; VALUE hash; + int err; { + hash_check(err); if (key == Qundef) return ST_CONTINUE; rb_hash_aset(hash, rb_funcall(key, ID_to_s, 0, 0), value); - return ST_CONTINUE; + return ST_CHECK; } static VALUE @@ -216,9 +227,7 @@ tk_symbolkey2str(self, keys) volatile VALUE new_keys = rb_hash_new(); if NIL_P(keys) return new_keys; - if (TYPE(keys) != T_HASH) { - rb_raise(rb_eArgError, "Hash is expected"); - } + keys = rb_convert_type(keys, T_HASH, "Hash", "to_hash"); st_foreach(RHASH(keys)->tbl, to_strkey, new_keys); return new_keys; } @@ -437,12 +446,16 @@ assoc2kv_enc(assoc, ary, self) } static int -push_kv(key, val, args) +push_kv(key, val, args, err) VALUE key; VALUE val; VALUE args; + int err; { - volatile VALUE ary = RARRAY(args)->ptr[0]; + volatile VALUE ary; + + hash_check(err); + ary = RARRAY(args)->ptr[0]; if (key == Qundef) return ST_CONTINUE; #if 0 @@ -451,12 +464,12 @@ push_kv(key, val, args) #endif RARRAY(ary)->ptr[RARRAY(ary)->len++] = key2keyname(key); - if (val == TK_None) return ST_CONTINUE; + if (val == TK_None) return ST_CHECK; RARRAY(ary)->ptr[RARRAY(ary)->len++] = get_eval_string_core(val, Qnil, RARRAY(args)->ptr[1]); - return ST_CONTINUE; + return ST_CHECK; } static VALUE @@ -483,12 +496,16 @@ hash2kv(hash, ary, self) } static int -push_kv_enc(key, val, args) +push_kv_enc(key, val, args, err) VALUE key; VALUE val; VALUE args; + int err; { - volatile VALUE ary = RARRAY(args)->ptr[0]; + volatile VALUE ary; + + hash_check(err); + ary = RARRAY(args)->ptr[0]; if (key == Qundef) return ST_CONTINUE; #if 0 @@ -500,12 +517,12 @@ push_kv_enc(key, val, args) #endif RARRAY(ary)->ptr[RARRAY(ary)->len++] = key2keyname(key); - if (val == TK_None) return ST_CONTINUE; + if (val == TK_None) return ST_CHECK; RARRAY(ary)->ptr[RARRAY(ary)->len++] = get_eval_string_core(val, Qtrue, RARRAY(args)->ptr[1]); - return ST_CONTINUE; + return ST_CHECK; } static VALUE |