From 2bb0d0249d2823255d039b5d6bcd16e30a923a80 Mon Sep 17 00:00:00 2001 From: Martin Griffin Date: Wed, 12 Nov 2025 21:52:31 +0000 Subject: [PATCH] SpriteCB_EnemyShadow: Avoid use-after-free (#8220) --- src/battle_gfx_sfx_util.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 20b0032e30..e7679d2b6d 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -1239,6 +1239,12 @@ void LoadAndCreateEnemyShadowSprites(void) void SpriteCB_EnemyShadow(struct Sprite *shadowSprite) { + if (gBattleSpritesDataPtr == NULL) + { + shadowSprite->callback = SpriteCB_SetInvisible; + return; + } + bool8 invisible = FALSE; u8 battler = shadowSprite->tBattlerId; struct Sprite *battlerSprite = &gSprites[gBattlerSpriteIds[battler]];