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

1 files changed, 10 insertions, 0 deletions

diff --git a/parse.y b/parse.y
index 2fbcf565d0..b84d6143bf 100644
--- a/parse.y
+++ b/parse.y
@@ -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);