diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-02-27 12:00:24 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-02-27 12:00:24 +0900 |
| commit | 3da372b30fc7996222851b265754f1213742ec90 (patch) | |
| tree | c860dcb5ef229ab5f1273b7aa0caef2a6ac20fa1 /mrbgems/mruby-pack | |
| parent | 30b1287df5d2dc23b797a578e4916199715754ef (diff) | |
| download | mruby-3da372b30fc7996222851b265754f1213742ec90.tar.gz mruby-3da372b30fc7996222851b265754f1213742ec90.zip | |
pack.c: add more checks for `pack_pack()`.
Diffstat (limited to 'mrbgems/mruby-pack')
| -rw-r--r-- | mrbgems/mruby-pack/src/pack.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mrbgems/mruby-pack/src/pack.c b/mrbgems/mruby-pack/src/pack.c index b0da7b06b..e52171d6b 100644 --- a/mrbgems/mruby-pack/src/pack.c +++ b/mrbgems/mruby-pack/src/pack.c @@ -1186,10 +1186,14 @@ mrb_pack_pack(mrb_state *mrb, mrb_value ary) if (dir == PACK_DIR_INVALID) continue; else if (dir == PACK_DIR_NUL) { - ridx += pack_x(mrb, mrb_nil_value(), result, ridx, count, flags); - continue; + ridx += pack_x(mrb, mrb_nil_value(), result, ridx, count, flags); + if (ridx < 0) goto overflow; + continue; } + if ((flags & PACK_FLAG_WIDTH) && aidx >= RARRAY_LEN(ary)) { + mrb_raise(mrb, E_ARGUMENT_ERROR, "too few arguments"); + } for (; aidx < RARRAY_LEN(ary); aidx++) { if (count == 0 && !(flags & PACK_FLAG_WIDTH)) break; @@ -1258,6 +1262,7 @@ mrb_pack_pack(mrb_state *mrb, mrb_value ary) } } if (ridx < 0) { + overflow: mrb_raise(mrb, E_RANGE_ERROR, "negative (or overflowed) template size"); } } |