Merge pull request #448 from AliceLR/disable-msan-recovery

Disable -fsanitize-recover=memory (is masking errors).
AliceLR · May 19, 2024 · 56de35b · 56de35b
2 parents f206f89 + fdb14b7
commit 56de35b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -256,7 +256,7 @@ ifeq (${SANITIZER},memory)
 # external libraries turned off or re-built with instrumentation.
 # This sanitizer is only implemented by clang.
 OPTIMIZE_FLAGS += -fsanitize=memory -fno-omit-frame-pointer -fPIC \
- -fsanitize-recover=memory -fsanitize-memory-track-origins=2
+ -fsanitize-memory-track-origins=2
 ARCH_EXE_LDFLAGS += -pie
 endif
 

diff --git a/src/legacy_robot.c b/src/legacy_robot.c
@@ -51,6 +51,7 @@ static boolean legacy_load_robot_v1(struct world *mzx_world, struct robot *cur_r
   int program_v2_length;
 
   create_blank_robot(cur_robot);
+  cur_robot->world_version = mzx_world->version;
 
   program_v1_length = vfgetw(vf);
   vfgetw(vf); // Unused high bytes