From 917b0eb8beef8f21a8952f27e3d7bd0de2077a60 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Mon, 14 Nov 2022 16:52:34 -0700 Subject: [PATCH] model3d: disable UBSan alignment sanitization on m3d_load Works around: https://gitlab.com/bztsrc/model3d/-/issues/19 Signed-off-by: Stephen Gutekanst --- libs/model3d/build.zig | 2 +- libs/model3d/src/c/m3d.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/model3d/build.zig b/libs/model3d/build.zig index 1488f0a5..23480be6 100644 --- a/libs/model3d/build.zig +++ b/libs/model3d/build.zig @@ -23,7 +23,7 @@ pub fn testStep(b: *std.build.Builder, mode: std.builtin.Mode, target: std.zig.C pub fn link(b: *std.build.Builder, step: *std.build.LibExeObjStep) void { const lib = b.addStaticLibrarySource("model3d", null); - lib.addCSourceFile(sdkPath("/src/c/m3d.c"), &.{ "-std=c89", "-DM3D_ASCII" }); + lib.addCSourceFile(sdkPath("/src/c/m3d.c"), &.{ "-std=c89" }); lib.linkLibC(); step.addIncludePath(sdkPath("/src/c/")); step.linkLibrary(lib); diff --git a/libs/model3d/src/c/m3d.h b/libs/model3d/src/c/m3d.h index 3b29927d..2bbb5c4d 100644 --- a/libs/model3d/src/c/m3d.h +++ b/libs/model3d/src/c/m3d.h @@ -2377,6 +2377,7 @@ static M3D_FLOAT _m3d_rsq(M3D_FLOAT x) /** * Function to decode a Model 3D into in-memory format */ +__attribute__((no_sanitize("alignment"))) // TODO(model3d): https://gitlab.com/bztsrc/model3d/-/issues/19 m3d_t *m3d_load(unsigned char *data, m3dread_t readfilecb, m3dfree_t freecb, m3d_t *mtllib) { unsigned char *end, *chunk, *buff, weights[8];