From 6a5cdfacbf2577e86a84555b24ba2cbc03bfa394 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 6 Nov 2014 10:42:10 +0000 Subject: [PATCH] * re.c (unescape_nonascii): cast -1 for the case char is unsigned char. If char is signed char, for example gcc for ARM or ppc64, it caused infinite loop. http://kmuto.jp/build-ruby/arm/ruby-trunk/log/20141106T013005Z.fail.html.gz http://rubyci.blob.core.windows.net/f19p8/ruby-trunk/log/20141106T090217Z.fail.html.gz git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ re.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 10dc130342..48c545ec1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Nov 6 19:27:34 2014 NARUSE, Yui + + * re.c (unescape_nonascii): cast -1 for the case char is unsigned char. + If char is signed char, for example gcc for ARM or ppc64, it caused + infinite loop. + http://kmuto.jp/build-ruby/arm/ruby-trunk/log/20141106T013005Z.fail.html.gz + http://rubyci.blob.core.windows.net/f19p8/ruby-trunk/log/20141106T090217Z.fail.html.gz + Thu Nov 6 09:53:18 2014 Eric Wong * lib/uri/rfc2396_parser.rb (initialize): reduce bytecode size diff --git a/re.c b/re.c index 9258f83ee4..588eb9c833 100644 --- a/re.c +++ b/re.c @@ -2286,7 +2286,7 @@ unescape_nonascii(const char *p, const char *end, rb_encoding *enc, p = p-2; if (enc == rb_usascii_encoding()) { c = read_escaped_byte(&p, end, err); - if (c == -1) return -1; + if (c == (char)-1) return -1; rb_str_buf_cat(buf, &c, 1); } else {