From 59105d74f8789f4108ef04b4b6cfe965e2f82bc2 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Mon, 9 Jun 2025 00:14:47 +0200 Subject: [PATCH 1/2] Fix UBSAN warning when starting the jetski race (#263) --- LEGO1/lego/legoomni/src/video/legopartpresenter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp index 8c960d6e..9c3a0417 100644 --- a/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legopartpresenter.cpp @@ -91,7 +91,7 @@ MxResult LegoPartPresenter::Read(MxDSChunk& p_chunk) SDL_strlwr(textureName); if (textureName[0] == '^') { - strcpy(textureName, textureName + 1); + memmove(textureName, textureName + 1, strlen(textureName + 1)); if (g_partPresenterConfig1) { texture = new LegoTexture(); From 1a91547011efdd0383389e99afe88857b3ee517b Mon Sep 17 00:00:00 2001 From: Christian Semmler Date: Sun, 8 Jun 2025 15:55:35 -0700 Subject: [PATCH 2/2] Update legomodelpresenter.cpp (#264) * Update legomodelpresenter.cpp * Update renderer.cpp --- LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp | 2 +- miniwin/src/d3drm/backends/opengl15/renderer.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp index 405154c1..603df50e 100644 --- a/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp +++ b/LEGO1/lego/legoomni/src/video/legomodelpresenter.cpp @@ -98,7 +98,7 @@ MxResult LegoModelPresenter::CreateROI(MxDSChunk* p_chunk) SDL_strlwr(textureName); if (textureName[0] == '^') { - memmove(textureName, textureName + 1, strlen(textureName)); + memmove(textureName, textureName + 1, strlen(textureName + 1)); if (g_modelPresenterConfig) { texture = new LegoTexture(); diff --git a/miniwin/src/d3drm/backends/opengl15/renderer.cpp b/miniwin/src/d3drm/backends/opengl15/renderer.cpp index 3af99a75..e685d607 100644 --- a/miniwin/src/d3drm/backends/opengl15/renderer.cpp +++ b/miniwin/src/d3drm/backends/opengl15/renderer.cpp @@ -335,7 +335,8 @@ void OpenGL15Renderer::SubmitDraw( if (appearance.flat) { glShadeModel(GL_FLAT); - } else { + } + else { glShadeModel(GL_SMOOTH); }