1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

parser.rl: check before use

Browse Source 
* ext/json/parser/parser.rl (unescape_unicode): check if valid
  before bit-or assignments.
  reported by Denis Denisov <denji0k AT gmail.com>.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-26 06:13:15 +00:00
parent ed316bcfad
commit 993f22cb1b
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,4 +1,8 @@
Fri Dec 26 15:09:27 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Dec 26 15:13:13 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/json/parser/parser.rl (unescape_unicode): check if valid
before bit-or assignments.
reported by Denis Denisov <denji0k AT gmail.com>.
* ext/nkf/nkf-utf8/nkf.c (nkf_iconv_t): fix a missing semicolon. * ext/nkf/nkf-utf8/nkf.c (nkf_iconv_t): fix a missing semicolon.
reported by Denis Denisov <denji0k AT gmail.com>. reported by Denis Denisov <denji0k AT gmail.com>.

8
ext/json/parser/parser.c
View File

@ -28,16 +28,16 @@ static UTF32 unescape_unicode(const unsigned char *p)
UTF32 result = 0; UTF32 result = 0;
b = digit_values[p[0]]; b = digit_values[p[0]];
if (b < 0) return UNI_REPLACEMENT_CHAR; if (b < 0) return UNI_REPLACEMENT_CHAR;
result = (result << 4) | b; result = (result << 4) | (unsigned char)b;
b = digit_values[p[1]]; b = digit_values[p[1]];
result = (result << 4) | b;
if (b < 0) return UNI_REPLACEMENT_CHAR; if (b < 0) return UNI_REPLACEMENT_CHAR;
result = (result << 4) | (unsigned char)b;
b = digit_values[p[2]]; b = digit_values[p[2]];
result = (result << 4) | b;
if (b < 0) return UNI_REPLACEMENT_CHAR; if (b < 0) return UNI_REPLACEMENT_CHAR;
result = (result << 4) | (unsigned char)b;
b = digit_values[p[3]]; b = digit_values[p[3]];
result = (result << 4) | b;
if (b < 0) return UNI_REPLACEMENT_CHAR; if (b < 0) return UNI_REPLACEMENT_CHAR;
result = (result << 4) | (unsigned char)b;
return result; return result;
} }

10
ext/json/parser/parser.rl
View File

@ -26,16 +26,16 @@ static UTF32 unescape_unicode(const unsigned char *p)
UTF32 result = 0; UTF32 result = 0;
b = digit_values[p[0]]; b = digit_values[p[0]];
if (b < 0) return UNI_REPLACEMENT_CHAR; if (b < 0) return UNI_REPLACEMENT_CHAR;
result = (result << 4) | b; result = (result << 4) | (unsigned char)b;
b = digit_values[p[1]]; b = digit_values[p[1]];
result = (result << 4) | b;
if (b < 0) return UNI_REPLACEMENT_CHAR; if (b < 0) return UNI_REPLACEMENT_CHAR;
result = (result << 4) | (unsigned char)b;
b = digit_values[p[2]]; b = digit_values[p[2]];
result = (result << 4) | b;
if (b < 0) return UNI_REPLACEMENT_CHAR; if (b < 0) return UNI_REPLACEMENT_CHAR;
result = (result << 4) | (unsigned char)b;
b = digit_values[p[3]]; b = digit_values[p[3]];
result = (result << 4) | b;
if (b < 0) return UNI_REPLACEMENT_CHAR; if (b < 0) return UNI_REPLACEMENT_CHAR;
result = (result << 4) | (unsigned char)b;
return result; 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"); rb_require("json/common");
mJSON = rb_define_module("JSON"); mJSON = rb_define_module("JSON");