From 63da304fb7c849e675e762c626e074d130d1e715 Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 5 Feb 2012 15:06:50 +0000 Subject: merge revision(s) 34306: * ext/json/parser/parser.rl (json_string_unescape): workaround fix for over optimization of GCC 4.7. [ruby-core:42085] [Bug #5888] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51862 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/json/parser/parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/json/parser/parser.c') diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c index d1d14c79ca..1773616463 100644 --- a/ext/json/parser/parser.c +++ b/ext/json/parser/parser.c @@ -1293,6 +1293,7 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd) { char *p = string, *pe = string, *unescape; int unescape_len; + char buf[4]; while (pe < stringEnd) { if (*pe == '\\') { @@ -1325,7 +1326,6 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd) if (pe > stringEnd - 4) { return Qnil; } else { - char buf[4]; UTF32 ch = unescape_unicode((unsigned char *) ++pe); pe += 3; if (UNI_SUR_HIGH_START == (ch & 0xFC00)) { -- cgit v1.2.3