diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:39:48 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-05 09:39:48 +0000 |
commit | 69b51262f3ec90a2ac9553d7cd34ee285ec59ad5 (patch) | |
tree | d5dbd1722ac67757360b090c5c2890d99b0fb865 /parse.y | |
parent | 190554f06592cfce9ff262f594eaff28d5aa987a (diff) |
merges r25351 from trunk into ruby_1_9_1. fixes the backport task #2214.
--
* parse.y (rb_intern3): check symbol table overflow.
[ruby-core:26092]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26011 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -9577,6 +9577,16 @@ rb_intern3(const char *name, long len, rb_encoding *enc) mbstr:; } new_id: + if (!(global_symbols.last_id << (ID_SCOPE_SHIFT+RUBY_SPECIAL_SHIFT))) { + if (len > 20) { + rb_raise(rb_eRuntimeError, "symbol table overflow (symbol %.20s...)", + name); + } + else { + rb_raise(rb_eRuntimeError, "symbol table overflow (symbol %.*s)", + (int)len, name); + } + } id |= ++global_symbols.last_id << ID_SCOPE_SHIFT; id_register: return register_symid(id, name, len, enc); |