Avoid undefined behaviour when deleting a void *

TheAssemblyArmada · Mar 20, 2024 · 5492cc6 · 5492cc6
1 parent d5d959a
commit 5492cc6
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/common/bfiofile.cpp b/common/bfiofile.cpp
@@ -320,7 +320,7 @@ void BufferIOFileClass::Free(void)
 {
     if (Buffer) {
         if (IsAllocated) {
-            delete[] Buffer;
+            delete[] static_cast<char*>(Buffer);
             IsAllocated = false;
         }
 

diff --git a/common/mixfile.h b/common/mixfile.h
@@ -653,7 +653,7 @@ template <class T, class TCRC> bool MixFileClass<T, TCRC>::Cache(Buffer const* b
         */
         int actual = straw->Get(Data, DataSize);
         if (actual != DataSize) {
-            delete[] Data;
+            delete[] static_cast<char*>(Data);
             Data = NULL;
             file.Error(EIO);
             return (false);
@@ -670,7 +670,7 @@ template <class T, class TCRC> bool MixFileClass<T, TCRC>::Cache(Buffer const* b
             sha.Result(digest2);
             fstraw.Get(digest1, sizeof(digest1));
             if (memcmp(digest1, digest2, sizeof(digest1)) != 0) {
-                delete[] Data;
+                delete[] static_cast<char*>(Data);
                 Data = NULL;
                 return (false);
             }
@@ -702,7 +702,7 @@ template <class T, class TCRC> bool MixFileClass<T, TCRC>::Cache(Buffer const* b
 template <class T, class TCRC> void MixFileClass<T, TCRC>::Free(void)
 {
     if (Data != NULL && IsAllocated) {
-        delete[] Data;
+        delete[] static_cast<char*>(Data);
     }
     Data = NULL;
     IsAllocated = false;

diff --git a/redalert/event.cpp b/redalert/event.cpp
@@ -901,7 +901,7 @@ void EventClass::Execute(void)
             printf("%d\n", ((char*)Data.Variable.Pointer)[i]);
         }
         if (ID != PlayerPtr->ID) {
-            delete[] Data.Variable.Pointer;
+            delete[] static_cast<char*>(Data.Variable.Pointer);
         }
         break;
 

diff --git a/redalert/init.cpp b/redalert/init.cpp
@@ -2910,7 +2910,7 @@ void Free_Heaps(void)
     */
     for (int index = 0; index < ARRAY_SIZE(SpeechBuffer); index++) {
         if (SpeechBuffer[index]) {
-            delete[] SpeechBuffer[index];
+            delete[] static_cast<char*>(SpeechBuffer[index]);
             SpeechBuffer[index] = NULL;
         }
     }
@@ -2928,4 +2928,4 @@ void Free_Heaps(void)
         delete InterpolationTable;
         InterpolationTable = NULL;
     }
-}
+}
diff --git a/redalert/msgbox.cpp b/redalert/msgbox.cpp
@@ -442,7 +442,7 @@ int WWMessageBox::Process(const char* msg, const char* b1txt, const char* b2txt,
         }
         SeenBuff.Unlock();
 
-        delete[] back;
+        delete[] static_cast<char*>(back);
         back = NULL;
         Show_Mouse();
     }

diff --git a/redalert/queue.cpp b/redalert/queue.cpp
@@ -2870,7 +2870,7 @@ static int Extract_Uncompressed_Events(void* buf, int bufsize)
 
             if (!DoList.Add(*event)) {
                 if (event->Type == EventClass::ADDPLAYER) {
-                    delete[] event->Data.Variable.Pointer;
+                    delete[] static_cast<char*>(event->Data.Variable.Pointer);
                 }
                 return (-1);
             }
@@ -3035,7 +3035,7 @@ static int Extract_Compressed_Events(void* buf, int bufsize)
 
             if (!DoList.Add(eventdata)) {
                 if (eventdata.Type == EventClass::ADDPLAYER) {
-                    delete[] eventdata.Data.Variable.Pointer;
+                    delete[] static_cast<char*>(eventdata.Data.Variable.Pointer);
                 }
                 return (-1);
             }
@@ -4399,4 +4399,4 @@ void Check_Mirror(void)
 #endif
 } // end of Check_Mirror
 
-/*************************** end of queue.cpp ******************************/
+/*************************** end of queue.cpp ******************************/
diff --git a/redalert/stats.cpp b/redalert/stats.cpp
@@ -829,7 +829,7 @@ void Send_Statistics_Packet(void)
     /*
     ** Tidy up
     */
-    delete[] packet;
+    delete[] static_cast<char*>(packet);
 
     GameStatisticsPacketSent = true;
 #endif // INTERNET_OFF

diff --git a/tiberiandawn/ending.cpp b/tiberiandawn/ending.cpp
@@ -246,8 +246,8 @@ void Nod_Ending(void)
 
     Play_Movie("CC2TEASE");
 
-    delete[] localpal;
+    delete[] static_cast<char*>(localpal);
     delete TextPrintBuffer;
     BlitList.Clear();
 }
-#endif
+#endif
diff --git a/tiberiandawn/init.cpp b/tiberiandawn/init.cpp
@@ -635,7 +635,7 @@ void Uninit_Game(void)
 {
     Map.Free_Cells();
 
-    delete[] SpeechBuffer;
+    delete[] static_cast<char*>(SpeechBuffer);
 
     CCFileClass::Clear_Search_Drives();
     MFCD::Free_All();
@@ -2075,7 +2075,7 @@ void Parse_INI_File(void)
     Fetch working pointer to the INI staging buffer. Make sure that the buffer
     is cleared out before proceeding.
     ------------------------------------------------------------------------*/
-    buffer = (char*)_ShapeBuffer;
+    buffer = _ShapeBuffer;
     memset(buffer, '\0', _ShapeBufferSize);
 
     /*------------------------------------------------------------------------

diff --git a/tiberiandawn/msgbox.cpp b/tiberiandawn/msgbox.cpp
@@ -447,7 +447,7 @@ int WWMessageBox::Process(const char* msg, const char* b1txt, const char* b2txt,
         }
         SeenBuff.Unlock();
 
-        delete[] back;
+        delete[] static_cast<char*>(back);
         back = NULL;
         Show_Mouse();
     }

diff --git a/tiberiandawn/stats.cpp b/tiberiandawn/stats.cpp
@@ -593,7 +593,7 @@ void Send_Statistics_Packet(void)
     ** Tidy up
     */
     CCDebugString("C&C95 - About to delete packet memory.\n");
-    delete[] packet;
+    delete[] static_cast<char*>(packet);
 
     GameStatisticsPacketSent = true;
     CCDebugString("C&C95 - Returning from Send_Statistics_Packet.\n");