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

Revert "vm.c: add assertions instead of mrb_ensure_hash_type()."

Browse Source 
This reverts commit 913a0a5a03.
In some cases, `OP_HASHADD` operand may not be `Hash`. We should check
explicitly in those cases.
This commit is contained in:
Yukihiro "Matz" Matsumoto
2021-09-24 17:10:11 +09:00
parent ab54ca272a
commit c70159b356
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+2 -2
View File
@@ -2687,7 +2687,7 @@ RETRY_TRY_BLOCK:
int lim = a+b*2+1;
hash = regs[a];
mrb_assert(mrb_type(hash) == MRB_TT_HASH);
mrb_ensure_hash_type(mrb, hash);
for (i=a+1; i<lim; i+=2) {
mrb_hash_set(mrb, hash, regs[i], regs[i+1]);
}
@@ -2697,7 +2697,7 @@ RETRY_TRY_BLOCK:
CASE(OP_HASHCAT, B) {
mrb_value hash = regs[a];
mrb_assert(mrb_type(hash) == MRB_TT_HASH);
mrb_ensure_hash_type(mrb, hash);
mrb_hash_merge(mrb, hash, regs[a+1]);
mrb_gc_arena_restore(mrb, ai);
NEXT;