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

[ruby/json] Fix right shift warnings

Browse Source 
Ignoring `CHAR_BITS` > 8 platform, as far as `ch` indexes
`escape_table` that is hard-coded as 256 elements.

```
../../../../src/ext/json/generator/generator.c(121): warning C4333: '>>': right shift by too large amount, data loss
../../../../src/ext/json/generator/generator.c(122): warning C4333: '>>': right shift by too large amount, data loss
../../../../src/ext/json/generator/generator.c(243): warning C4333: '>>': right shift by too large amount, data loss
../../../../src/ext/json/generator/generator.c(244): warning C4333: '>>': right shift by too large amount, data loss
../../../../src/ext/json/generator/generator.c(291): warning C4333: '>>': right shift by too large amount, data loss
../../../../src/ext/json/generator/generator.c(292): warning C4333: '>>': right shift by too large amount, data loss
```

https://github.com/ruby/json/commit/fb82373612
This commit is contained in:
Nobuyoshi Nakada 2024-11-06 19:56:34 +09:00 committed by Jean Boussier
parent 6cea370b23
commit 29d76d8c8b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,8 +118,8 @@ static void convert_UTF8_to_JSON(FBuffer *out_buffer, VALUE str, const char esca
case '\r': fbuffer_append(out_buffer, "\\r", 2); break; case '\r': fbuffer_append(out_buffer, "\\r", 2); break;
case '\t': fbuffer_append(out_buffer, "\\t", 2); break; case '\t': fbuffer_append(out_buffer, "\\t", 2); break;
default: { default: {
scratch[2] = hexdig[ch >> 12]; scratch[2] = '0';
scratch[3] = hexdig[(ch >> 8) & 0xf]; scratch[3] = '0';
scratch[4] = hexdig[(ch >> 4) & 0xf]; scratch[4] = hexdig[(ch >> 4) & 0xf];
scratch[5] = hexdig[ch & 0xf]; scratch[5] = hexdig[ch & 0xf];
fbuffer_append(out_buffer, scratch, 6); fbuffer_append(out_buffer, scratch, 6);
@ -240,8 +240,8 @@ static void convert_ASCII_to_JSON(FBuffer *out_buffer, VALUE str, const char esc
case '\r': fbuffer_append(out_buffer, "\\r", 2); break; case '\r': fbuffer_append(out_buffer, "\\r", 2); break;
case '\t': fbuffer_append(out_buffer, "\\t", 2); break; case '\t': fbuffer_append(out_buffer, "\\t", 2); break;
default: default:
scratch[2] = hexdig[ch >> 12]; scratch[2] = '0';
scratch[3] = hexdig[(ch >> 8) & 0xf]; scratch[3] = '0';
scratch[4] = hexdig[(ch >> 4) & 0xf]; scratch[4] = hexdig[(ch >> 4) & 0xf];
scratch[5] = hexdig[ch & 0xf]; scratch[5] = hexdig[ch & 0xf];
fbuffer_append(out_buffer, scratch, 6); fbuffer_append(out_buffer, scratch, 6);
@ -288,8 +288,8 @@ static void convert_UTF8_to_ASCII_only_JSON(FBuffer *out_buffer, VALUE str, cons
case '\r': fbuffer_append(out_buffer, "\\r", 2); break; case '\r': fbuffer_append(out_buffer, "\\r", 2); break;
case '\t': fbuffer_append(out_buffer, "\\t", 2); break; case '\t': fbuffer_append(out_buffer, "\\t", 2); break;
default: { default: {
scratch[2] = hexdig[ch >> 12]; scratch[2] = '0';
scratch[3] = hexdig[(ch >> 8) & 0xf]; scratch[3] = '0';
scratch[4] = hexdig[(ch >> 4) & 0xf]; scratch[4] = hexdig[(ch >> 4) & 0xf];
scratch[5] = hexdig[ch & 0xf]; scratch[5] = hexdig[ch & 0xf];
fbuffer_append(out_buffer, scratch, 6); fbuffer_append(out_buffer, scratch, 6);