From c2b39a650243d521a6093702e18a731070af370e Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sun, 5 Jun 2022 23:42:44 -0600 Subject: [PATCH] decompile: fix texture name crash with missing texinfo --- bsputil/decompile.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bsputil/decompile.cpp b/bsputil/decompile.cpp index 049b4128..2e31a67a 100644 --- a/bsputil/decompile.cpp +++ b/bsputil/decompile.cpp @@ -860,7 +860,7 @@ static compiled_brush_t DecompileLeafTask( side.valve = finalSide.plane.normal; DefaultSkipSide(side, bsp); } else { - const char *name; + const char *name = nullptr; const gtexinfo_t *ti; auto faces = finalSide.faces; @@ -871,10 +871,12 @@ static compiled_brush_t DecompileLeafTask( ti = Face_Texinfo(bsp, face); } else if (finalSide.plane.source) { ti = BSP_GetTexinfo(bsp, finalSide.plane.source->texinfo); - name = ti->texture.data(); + if (ti) { + name = ti->texture.data(); + } } - if (!name && !*name) { + if (!name || !name[0]) { DefaultSkipSide(side, bsp); } else { OverrideTextureForContents(side, bsp, name, brush.contents);