From 54b2c5dcbda3d877650d1a0e7b59242e1427ddca Mon Sep 17 00:00:00 2001 From: animalstyletaco Date: Sun, 16 Jul 2023 07:55:46 -0700 Subject: [PATCH] Added bound check for blend vertex count (#2830) Co-authored-by: animalstyletaco --- decompiler/level_extractor/extract_merc.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/decompiler/level_extractor/extract_merc.cpp b/decompiler/level_extractor/extract_merc.cpp index 2075c873e..716d4acf2 100644 --- a/decompiler/level_extractor/extract_merc.cpp +++ b/decompiler/level_extractor/extract_merc.cpp @@ -1083,7 +1083,10 @@ ConvertedMercEffect convert_merc_effect(const MercEffect& input_effect, size_t original_size = result.blerc_vertices_i.size(); result.blerc_vertices_i.resize(original_size + bc.blend_vtx_count); - auto* out_vertices = &result.blerc_vertices_i[original_size]; + BlercVtxInt* out_vertices = nullptr; + if (bc.blend_vtx_count) { + out_vertices = &result.blerc_vertices_i[original_size]; + } // the base position of this vertex. for (int vi = 0; vi < bc.blend_vtx_count; vi++) {