From 71553b91f64288e5e9996a143685bf4697819d84 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 12 Aug 2008 06:39:08 +0000 Subject: [PATCH] * string.c (rb_str_intern): should check symbol table overflow. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ string.c | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2240236fc9..b9f784d8fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Aug 12 15:37:40 2008 Yukihiro Matsumoto + + * string.c (rb_str_intern): should check symbol table overflow. + Tue Aug 12 15:31:04 2008 Minero Aoki * lib/net/http.rb (send_request_with_body): Content-Length should diff --git a/string.c b/string.c index e14f298cc8..ba2c454df8 100644 --- a/string.c +++ b/string.c @@ -5840,10 +5840,25 @@ VALUE rb_str_intern(VALUE s) { VALUE str = RB_GC_GUARD(s); - ID id; + VALUE sym; + ID id, id2; id = rb_intern_str(str); - return ID2SYM(id); + sym = ID2SYM(id); + id2 = SYM2ID(sym); + if (id != id2) { + char *name = rb_id2name(id2); + + if (name) { + rb_raise(rb_eRuntimeError, "symbol table overflow (%s given for %s)", + name, RSTRING_PTR(str)); + } + else { + rb_raise(rb_eRuntimeError, "symbol table overflow (symbol %s)", + RSTRING_PTR(str)); + } + } + return sym; }