Synchronize changes from 1.6 master branch [ci skip]

778207b Fix heap corruption crash (No dialog) @ GTA SA 0x4fc66f: Engine sound type 4: Accelerate or type 5/Gear change
71ab849 Addendum to 651cea5

Author: github-actions[bot]

Client/core/CrashHandler.cpp

@@ -708,31 +708,21 @@ void __cdecl AbortSignalHandler([[maybe_unused]] int signal) noexcept
     CONTEXT*           pCtx = nullptr;
     EXCEPTION_POINTERS exPtrs{};
 
-    if (BuildExceptionContext(exPtrs, pExRecord, pCtx, EXCEPTION_NONCONTINUABLE_EXCEPTION))
+    PFNCHFILTFN callback = g_pfnCrashCallback.load(std::memory_order_acquire);
+
+    if (callback != nullptr && BuildExceptionContext(exPtrs, pExRecord, pCtx, EXCEPTION_NONCONTINUABLE_EXCEPTION))
     {
-        PFNCHFILTFN callback = g_pfnCrashCallback.load(std::memory_order_acquire);
-        if (callback != nullptr)
-        {
-            LogHandlerEvent(DEBUG_PREFIX_PURECALL, "Calling crash handler callback");
+        LogHandlerEvent(DEBUG_PREFIX_PURECALL, "Calling crash handler callback");
 
-            try
-            {
-                callback(&exPtrs);
-            }
-            catch (...)
-            {
-                LogHandlerEvent(DEBUG_PREFIX_PURECALL, "Exception in crash handler callback");
-            }
+        try
+        {
+            callback(&exPtrs);
         }
-        else
+        catch (...)
         {
-            LogHandlerEvent(DEBUG_PREFIX_PURECALL, "No crash handler callback available");
+            LogHandlerEvent(DEBUG_PREFIX_PURECALL, "Exception in crash handler callback");
         }
     }
-    else
-    {
-        LogHandlerEvent(DEBUG_PREFIX_PURECALL, "Failed to allocate exception structures");
-    }
 
     if (pCtx != nullptr)
     {
@@ -1346,7 +1336,7 @@ static bool BuildExceptionContext(EXCEPTION_POINTERS& outExPtrs, EXCEPTION_RECOR
 
     PFNCHFILTFN callback = g_pfnCrashCallback.load(std::memory_order_acquire);
 
-    if (BuildExceptionContext(exPtrs, pExRecord, pCtx, CPP_EXCEPTION_CODE) && callback != nullptr)
+    if (callback != nullptr && BuildExceptionContext(exPtrs, pExRecord, pCtx, CPP_EXCEPTION_CODE))
     {
         SafeDebugOutput(DEBUG_PREFIX_CPP "Calling crash handler callback\n");
 

Client/mods/deathmatch/logic/CClientSound.h

@@ -127,7 +127,7 @@ class CClientSound final : public CClientEntity
         static AudioBufferDeleter ForExternalReference() noexcept { return AudioBufferDeleter(&NoopImpl); }
 
     private:
-        static void DeleteArrayImpl(void* ptr) noexcept { ::operator delete[](ptr); }
+        static void DeleteArrayImpl(void* ptr) noexcept { delete[] static_cast<uint8_t*>(ptr); }
         static void FreeImpl(void* ptr) noexcept { std::free(ptr); }
         static void NoopImpl(void*) noexcept {}