From fc2e41b9f239a26b89b92b5e834072422a6f792c Mon Sep 17 00:00:00 2001 From: AliceLR Date: Sun, 19 May 2024 02:04:47 -0600 Subject: [PATCH 1/2] Disable -fsanitize-recover=memory (is masking errors). --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a1cad143a..8268c18ea 100644 --- 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 From fdb14b7c5c9447e9eac88d56d26907203d2ab2f1 Mon Sep 17 00:00:00 2001 From: AliceLR Date: Sun, 19 May 2024 02:12:27 -0600 Subject: [PATCH 2/2] Fix uninitialized memory usage in 1.x robot label caching. --- src/legacy_robot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/legacy_robot.c b/src/legacy_robot.c index 800b95ede..ea3fe83ee 100644 --- 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