admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mruby-pack: add explicit casts to fix msvc warnings

Browse Source 
added explicit (int) casts when passing mrb_int count to pack/unpack
functions that expect int parameters. fixes C4244 warnings on windows
msvc builds where mrb_int is 64-bit but int is 32-bit.

count is validated to not exceed INT_MAX by read_tmpl, making these
casts safe.

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-10-11 12:47:54 +09:00
parent d1a48c03e2
commit 99d4629d59
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-pack/src/pack.c
+11 -11
View File
@@ -1834,7 +1834,7 @@ mrb_pack_pack(mrb_state *mrb, mrb_value ary)
if (dir == PACK_DIR_NUL) {
grow:
if (ridx > INT_MAX - count) goto overflow;
ridx += pack_nul(mrb, result, ridx, count);
ridx += pack_nul(mrb, result, ridx, (int)count);
continue;
}
else if (dir == PACK_DIR_BACK) {
@@ -1906,29 +1906,29 @@ mrb_pack_pack(mrb_state *mrb, mrb_value ary)
/* String formats with count - use (mrb, o, result, ridx, count, flags) signature */
case PACK_DIR_HEX:
ridx += pack_hex(mrb, o, result, ridx, count, flags);
ridx += pack_hex(mrb, o, result, ridx, (int)count, flags);
break;
case PACK_DIR_BSTR:
ridx += pack_bstr(mrb, o, result, ridx, count, flags);
ridx += pack_bstr(mrb, o, result, ridx, (int)count, flags);
break;
case PACK_DIR_STR:
ridx += pack_str(mrb, o, result, ridx, count, flags);
ridx += pack_str(mrb, o, result, ridx, (int)count, flags);
break;
/* String formats with count only - use (mrb, o, result, ridx, count) signature */
case PACK_DIR_BASE64:
ridx += pack_base64(mrb, o, result, ridx, count);
ridx += pack_base64(mrb, o, result, ridx, (int)count);
break;
case PACK_DIR_UU:
ridx += pack_uu(mrb, o, result, ridx, count);
ridx += pack_uu(mrb, o, result, ridx, (int)count);
break;
case PACK_DIR_QENC:
ridx += pack_qenc(mrb, o, result, ridx, count);
ridx += pack_qenc(mrb, o, result, ridx, (int)count);
break;
/* UTF8 format - special signature (mrb, o, result, ridx, count, flags) */
case PACK_DIR_UTF8:
ridx += pack_utf8(mrb, o, result, ridx, count, flags);
ridx += pack_utf8(mrb, o, result, ridx, (int)count, flags);
break;
default:
@@ -1996,15 +1996,15 @@ pack_unpack(mrb_state *mrb, mrb_value str, mrb_bool single)
switch (dir) {
/* String formats with count and flags - (mrb, sptr, len, result, count, flags) */
case PACK_DIR_HEX:
srcidx += unpack_hex(mrb, sptr, srclen - srcidx, result, count, flags);
srcidx += unpack_hex(mrb, sptr, srclen - srcidx, result, (int)count, flags);
if (single) goto single_return;
continue;
case PACK_DIR_BSTR:
srcidx += unpack_bstr(mrb, sptr, srclen - srcidx, result, count, flags);
srcidx += unpack_bstr(mrb, sptr, srclen - srcidx, result, (int)count, flags);
if (single) goto single_return;
continue;
case PACK_DIR_STR:
srcidx += unpack_str(mrb, sptr, srclen - srcidx, result, count, flags);
srcidx += unpack_str(mrb, sptr, srclen - srcidx, result, (int)count, flags);
if (single) goto single_return;
continue;