Merge pull request #1559 from mouzedrift/grenade-crash-fix

fix nullptr bug in Stop_slig_sounds
AliveTeam · Sep 1, 2022 · 775d997 · 775d997
2 parents e1238a7 + 18eb674
commit 775d997
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/Source/AliveLibAE/AmbientSound.cpp b/Source/AliveLibAE/AmbientSound.cpp
@@ -221,6 +221,7 @@ EXPORT void CC Stop_slig_sounds_4CBA70(CameraPos direction, s8 kZero)
     if (pTable->mArray[kZero].field_8_pScopedSeq)
     {
         pTable->mArray[kZero].field_8_pScopedSeq->VDestructor(1);
+        pTable->mArray[kZero].field_8_pScopedSeq = nullptr;
     }
 }
 

diff --git a/Source/AliveLibAO/AmbientSound.cpp b/Source/AliveLibAO/AmbientSound.cpp
@@ -224,6 +224,7 @@ EXPORT void CC Stop_slig_sounds_476A20(CameraPos direction, s8 kZero)
     if (pTable->mArray[kZero].field_8_pScopedSeq)
     {
         pTable->mArray[kZero].field_8_pScopedSeq->VDestructor(1);
+        pTable->mArray[kZero].field_8_pScopedSeq = nullptr;
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         if (pTable->mArray[kZero].field_8_pScopedSeq)
         {
             pTable->mArray[kZero].field_8_pScopedSeq->VDestructor(1);
+            pTable->mArray[kZero].field_8_pScopedSeq = nullptr;
         }
     }
@@ Expand Down @@