check for undef in decode

Author: Asmod4n

build_config.rb

@@ -4,17 +4,17 @@ def for_windows?
         ('A'..'Z').to_a.any? { |vol| Dir.exist?("#{vol}:") }
     end
     unless for_windows?
-        #conf.enable_sanitizer "address,undefined"
+        conf.enable_sanitizer "address,undefined"
     end
-    #conf.cxx.flags << '-fno-omit-frame-pointer' << '-g3' << '-ggdb3' << '-Og'
-    #conf.cc.flags << '-fno-omit-frame-pointer' << '-g3' << '-ggdb3' << '-Og'
-    #conf.enable_debug
+    conf.cxx.flags << '-fno-omit-frame-pointer' << '-g3' << '-ggdb3' << '-Og'
+    conf.cc.flags << '-fno-omit-frame-pointer' << '-g3' << '-ggdb3' << '-Og'
+    conf.enable_debug
     conf.cc.defines  << 'MRB_UTF8_STRING'
     conf.cxx.defines << 'MRB_UTF8_STRING'
     conf.enable_test
     conf.gembox 'default'
-    conf.cc.flags << '-O3' << '-march=native'
-    conf.cxx.flags << '-O3' << '-march=native'
+    #conf.cc.flags << '-O3' << '-march=native'
+    #conf.cxx.flags << '-O3' << '-march=native'
     conf.gem github: 'Asmod4n/mruby-benchmark-plus', branch: "main"
     conf.gem mgem: 'mruby-simplemsgpack'
     conf.gem mgem: 'mruby-fast-json'

src/mrb_cbor.c

@@ -374,13 +374,17 @@ decode_map(mrb_state* mrb, Reader* r, mrb_value src,
   mrb_value hash = mrb_hash_new(mrb);
   int idx = mrb_gc_arena_save(mrb);
 
+  // assign an ID to this hash for logging
+  mrb_int hid = mrb_obj_id(hash);
+
   if (reg && mrb_array_p(sharedrefs)) {
     mrb_ary_push(mrb, sharedrefs, hash);
   }
 
   for (mrb_int i = 0; i < len; i++) {
     mrb_value key = decode_value(mrb, r, src, sharedrefs);
     mrb_value val = decode_value(mrb, r, src, sharedrefs);
+
     mrb_hash_set(mrb, hash, key, val);
     mrb_gc_arena_restore(mrb, idx);
   }
@@ -760,7 +764,7 @@ decode_value(mrb_state* mrb, Reader* r, mrb_value src, mrb_value sharedrefs)
         result = decode_unhandled_tag(mrb, r, src, sharedrefs, tag);
     } break;
 
-    case 7:
+    case 7: {
       if (info < 20) { result = mrb_nil_value(); break; }
       switch (info) {
         case 20: result = mrb_false_value(); break;
@@ -778,14 +782,18 @@ decode_value(mrb_state* mrb, Reader* r, mrb_value src, mrb_value sharedrefs)
       } break;
       if (unlikely(mrb_undef_p(result)))
         mrb_raise(mrb, E_RUNTIME_ERROR, "invalid simple/float");
-      break;
+    } break;
 
     default:
       mrb_raisef(mrb, E_NOTIMP_ERROR, "Not implemented major type %d", major);
   }
 
   r->depth--;
-  return result;
+  if (likely(!mrb_undef_p(result))) {
+    return result;
+  } else {
+    mrb_raise(mrb, E_RUNTIME_ERROR, "CBOR internal error: failed to decode value");
+  }
 }
 
 static void