summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--re.c2
2 files changed, 9 insertions, 1 deletions
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 <naruse@ruby-lang.org>
+
+ * 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 <e@80x24.org>
* 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 {