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

[ruby/json] generator.c: better fix for comparison of integers of different signs

Browse Source 
https://github.com/ruby/json/commit/c372dc9268
This commit is contained in:
Jean Boussier 2024-10-08 08:21:29 -04:00 committed by git
parent dd4677cf06
commit 613694734e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/json/generator/generator.c
View File

@ -47,7 +47,7 @@ static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE in_string, bool out_
for (pos = 0; pos < in_utf8_len;) { for (pos = 0; pos < in_utf8_len;) {
uint32_t ch; uint32_t ch;
unsigned long ch_len; short ch_len;
bool should_escape; bool should_escape;
/* UTF-8 decoding */ /* UTF-8 decoding */
@ -55,7 +55,7 @@ static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE in_string, bool out_
ch = in_utf8_str[pos]; ch = in_utf8_str[pos];
ch_len = 1; ch_len = 1;
} else { } else {
unsigned long i; short i;
if ((in_utf8_str[pos] & 0x80) == 0x00) { ch_len = 1; ch = in_utf8_str[pos]; } /* leading 1 bit is 0b0 */ if ((in_utf8_str[pos] & 0x80) == 0x00) { ch_len = 1; ch = in_utf8_str[pos]; } /* leading 1 bit is 0b0 */
else if ((in_utf8_str[pos] & 0xE0) == 0xC0) { ch_len = 2; ch = in_utf8_str[pos] & 0x1F; } /* leading 3 bits are 0b110 */ else if ((in_utf8_str[pos] & 0xE0) == 0xC0) { ch_len = 2; ch = in_utf8_str[pos] & 0x1F; } /* leading 3 bits are 0b110 */
else if ((in_utf8_str[pos] & 0xF0) == 0xE0) { ch_len = 3; ch = in_utf8_str[pos] & 0x0F; } /* leading 4 bits are 0b1110 */ else if ((in_utf8_str[pos] & 0xF0) == 0xE0) { ch_len = 3; ch = in_utf8_str[pos] & 0x0F; } /* leading 4 bits are 0b1110 */
@ -109,7 +109,7 @@ static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE in_string, bool out_
scratch[5] = hexdig[ch & 0xf]; scratch[5] = hexdig[ch & 0xf];
fbuffer_append(out_buffer, scratch, 6); fbuffer_append(out_buffer, scratch, 6);
} else { } else {
uint16_t hi, lo; uint16_t hi, lo;
ch -= 0x10000; ch -= 0x10000;
hi = 0xD800 + (uint16_t)(ch >> 10); hi = 0xD800 + (uint16_t)(ch >> 10);
lo = 0xDC00 + (uint16_t)(ch & 0x3FF); lo = 0xDC00 + (uint16_t)(ch & 0x3FF);