From 43443d9377212844b84bc0440a8c35c4adfbb5d6 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Mon, 3 Aug 2020 19:46:34 +0900 Subject: Should not decrement `count` when `PACK_FLAG_COUNT2`; fix #5057 --- mrbgems/mruby-pack/src/pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mrbgems/mruby-pack/src') diff --git a/mrbgems/mruby-pack/src/pack.c b/mrbgems/mruby-pack/src/pack.c index 3a2c3367a..8169a90b5 100644 --- a/mrbgems/mruby-pack/src/pack.c +++ b/mrbgems/mruby-pack/src/pack.c @@ -1302,7 +1302,7 @@ mrb_pack_pack(mrb_state *mrb, mrb_value ary) aidx++; break; } - if (count > 0) { + if (!(flags & PACK_FLAG_COUNT2) && count > 0) { count--; } } -- cgit v1.2.3 From cfb799a18e5adf8166e7ec72e2066da38062df1b Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Tue, 4 Aug 2020 17:50:09 +0900 Subject: Fix wrong condition for `PACK_DIR_HEX`; ref #5057 --- mrbgems/mruby-pack/src/pack.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mrbgems/mruby-pack/src') diff --git a/mrbgems/mruby-pack/src/pack.c b/mrbgems/mruby-pack/src/pack.c index 8169a90b5..80de397f4 100644 --- a/mrbgems/mruby-pack/src/pack.c +++ b/mrbgems/mruby-pack/src/pack.c @@ -1298,11 +1298,12 @@ mrb_pack_pack(mrb_state *mrb, mrb_value ary) default: break; } - if (dir == PACK_DIR_STR || dir == PACK_DIR_BASE64) { /* always consumes 1 entry */ + if (dir == PACK_DIR_STR || dir == PACK_DIR_BASE64 || dir == PACK_DIR_HEX) { + /* always consumes 1 entry */ aidx++; break; } - if (!(flags & PACK_FLAG_COUNT2) && count > 0) { + if (count > 0) { count--; } } -- cgit v1.2.3