From 993f22cb1bba82be52e08e7132af003ae432163e Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 26 Dec 2014 06:13:15 +0000 Subject: parser.rl: check before use * ext/json/parser/parser.rl (unescape_unicode): check if valid before bit-or assignments. reported by Denis Denisov . git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/json/parser/parser.rl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ext/json/parser/parser.rl') diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl index 34e30f4868..3d7b5a65fb 100644 --- a/ext/json/parser/parser.rl +++ b/ext/json/parser/parser.rl @@ -26,16 +26,16 @@ static UTF32 unescape_unicode(const unsigned char *p) UTF32 result = 0; b = digit_values[p[0]]; if (b < 0) return UNI_REPLACEMENT_CHAR; - result = (result << 4) | b; + result = (result << 4) | (unsigned char)b; b = digit_values[p[1]]; - result = (result << 4) | b; if (b < 0) return UNI_REPLACEMENT_CHAR; + result = (result << 4) | (unsigned char)b; b = digit_values[p[2]]; - result = (result << 4) | b; if (b < 0) return UNI_REPLACEMENT_CHAR; + result = (result << 4) | (unsigned char)b; b = digit_values[p[3]]; - result = (result << 4) | b; if (b < 0) return UNI_REPLACEMENT_CHAR; + result = (result << 4) | (unsigned char)b; return result; } @@ -883,7 +883,7 @@ static VALUE cParser_quirks_mode_p(VALUE self) } -void Init_parser() +void Init_parser(void) { rb_require("json/common"); mJSON = rb_define_module("JSON"); -- cgit v1.2.3