refactor: Remove superfluous null tests before calls to free() (#1562)

xezon · web-flow · commit bb39cc7bbbd5 · 2025-09-12T09:46:09.000+02:00
diff --git a/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp
@@ -71,10 +71,8 @@ Font3DDataClass::Font3DDataClass( const char *filename )
  ***********************************************************************************************/
 Font3DDataClass::~Font3DDataClass(void)
 {
-	if (Name != NULL) {
-		free(Name);
-		Name = NULL;
-	}
+	free(Name);
+	Name = NULL;
 
 	REF_PTR_RELEASE(Texture);
 }
diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Utils.h b/Core/Libraries/Source/WWVegas/WWAudio/Utils.h
@@ -58,11 +58,7 @@
 				pobject = NULL;					\
 			}											\
 
-#define SAFE_FREE(pobject)						\
-			if (pobject) {							\
-				::free (pobject);					\
-				pobject = NULL;					\
-			}											\
+#define SAFE_FREE(pobject) { ::free (pobject); pobject = NULL; }
 
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/Core/Libraries/Source/WWVegas/WWLib/rcfile.cpp b/Core/Libraries/Source/WWVegas/WWLib/rcfile.cpp
@@ -65,16 +65,14 @@ ResourceFileClass::ResourceFileClass(HMODULE hmodule, char const *filename) :
 
 ResourceFileClass::~ResourceFileClass(void)
 {
-	if (ResourceName)
-		free(ResourceName);
+	free(ResourceName);
 }
 
 char const * ResourceFileClass::Set_Name(char const *filename)
 {
-	if (ResourceName) {
-		free(ResourceName);
-		ResourceName = NULL;
-	}
+	free(ResourceName);
+	ResourceName = NULL;
+
 	if (filename) {
 		ResourceName = strdup(filename);
 	}
diff --git a/Core/Tools/Autorun/Locale_API.cpp b/Core/Tools/Autorun/Locale_API.cpp
@@ -300,10 +300,8 @@ void Locale_Restore ( void )
 		LOCALE_freetable();
 		LOCALE_restore();
 	#else
-		if( LocaleFile ) {
-			free( LocaleFile );
-			LocaleFile = NULL;
-		}
+		free( LocaleFile );
+		LocaleFile = NULL;
 	#endif
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
@@ -1724,8 +1724,8 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 					{
 						if( cells[j].cellType == LISTBOX_TEXT && cells[j].data )
 							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
-//						if (cells[i].userData)
-//							free(cells[i].userData);
+
+//						free(cells[i].userData);
 						cells[j].data = NULL;
 						cells[j].userData = NULL;
 						cells[j].color = 0;
@@ -1957,8 +1957,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
 						}
 					}
-//					if ( cells[j].userData )
-//						free(cells[j].userData);
+//					free(cells[j].userData);
 
 					// Null out the data pointers so they're not destroyed when we free up this listdata
 					cells[j].userData = NULL;
@@ -2546,8 +2545,7 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 						TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
 					}
 				}
-//			if ( cells[j].userData )
-//					free(cells[j].userData);
+//				free(cells[j].userData);
 			}
 		}
 		if (i >= newLength) {
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/Generals/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
@@ -1971,10 +1971,8 @@ void ConnectionManager::parseUserList(const GameInfo *game)
 		return;
 	}
 
-	if (list != NULL) {
-		free(list); // from the strdup above.
-		list = NULL;
-	}
+	free(list); // from the strdup above.
+	list = NULL;
 	*/
 }
 
diff --git a/Generals/Code/GameEngine/Source/GameNetwork/GameInfo.cpp b/Generals/Code/GameEngine/Source/GameNetwork/GameInfo.cpp
@@ -1401,7 +1401,7 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
 						break;
 					}
 				}
-		if(freeMe)
+
 			free(freeMe);
 		}
 		else
@@ -1410,8 +1410,8 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
 			break;
 		}
 	}
-	if( buf )
-		free(buf);
+
+	free(buf);
 
 	//DEBUG_LOG(("Options were ok == %d", optionsOk));
 	if (optionsOk && sawMap && sawMapCRC && sawMapSize && sawSeed && sawSlotlist && sawCRC)
diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
@@ -337,15 +337,11 @@ HLodDefClass::~HLodDefClass(void)
  *=============================================================================================*/
 void HLodDefClass::Free(void)
 {
-	if (Name) {
-		::free(Name);
-		Name = NULL;
-	}
+	::free(Name);
+	Name = NULL;
 
-	if (HierarchyTreeName) {
-		::free(HierarchyTreeName);
-		HierarchyTreeName = NULL;
-	}
+	::free(HierarchyTreeName);
+	HierarchyTreeName = NULL;
 
 	if (Lod) {
 		delete[] Lod;
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/Gadget/GadgetListBox.cpp
@@ -1724,8 +1724,8 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 					{
 						if( cells[j].cellType == LISTBOX_TEXT && cells[j].data )
 							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
-//						if (cells[i].userData)
-//							free(cells[i].userData);
+
+//						free(cells[i].userData);
 						cells[j].data = NULL;
 						cells[j].userData = NULL;
 						cells[j].color = 0;
@@ -1957,8 +1957,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,
 							TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
 						}
 					}
-//					if ( cells[j].userData )
-//						free(cells[j].userData);
+//					free(cells[j].userData);
 
 					// Null out the data pointers so they're not destroyed when we free up this listdata
 					cells[j].userData = NULL;
@@ -2546,8 +2545,7 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )
 						TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );
 					}
 				}
-//			if ( cells[j].userData )
-//					free(cells[j].userData);
+//				free(cells[j].userData);
 			}
 		}
 		if (i >= newLength) {
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/ConnectionManager.cpp
@@ -1957,10 +1957,8 @@ void ConnectionManager::parseUserList(const GameInfo *game)
 		return;
 	}
 
-	if (list != NULL) {
-		free(list); // from the strdup above.
-		list = NULL;
-	}
+	free(list); // from the strdup above.
+	list = NULL;
 	*/
 }
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameInfo.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GameInfo.cpp
@@ -1455,7 +1455,7 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
 						break;
 					}
 				}
-		if(freeMe)
+
 			free(freeMe);
 		}
 		else
@@ -1464,8 +1464,8 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)
 			break;
 		}
 	}
-	if( buf )
-		free(buf);
+
+	free(buf);
 
 	//DEBUG_LOG(("Options were ok == %d", optionsOk));
 	if (optionsOk && sawMap && sawMapCRC && sawMapSize && sawSeed && sawSlotlist && sawCRC && sawUseStats && sawSuperweaponRestriction && sawStartingCash && sawOldFactions )
diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp
@@ -337,15 +337,11 @@ HLodDefClass::~HLodDefClass(void)
  *=============================================================================================*/
 void HLodDefClass::Free(void)
 {
-	if (Name) {
-		::free(Name);
-		Name = NULL;
-	}
+	::free(Name);
+	Name = NULL;
 
-	if (HierarchyTreeName) {
-		::free(HierarchyTreeName);
-		HierarchyTreeName = NULL;
-	}
+	::free(HierarchyTreeName);
+	HierarchyTreeName = NULL;
 
 	if (Lod) {
 		delete[] Lod;
diff --git a/GeneralsMD/Code/Tools/wdump/rawfilem.cpp b/GeneralsMD/Code/Tools/wdump/rawfilem.cpp
@@ -141,7 +141,7 @@ RawFileMClass::RawFileMClass(char const * filename) :
  *=============================================================================================*/
 char const * RawFileMClass::Set_Name(char const * filename)
 {
-	if (Filename != NULL && Allocated) {
+	if (Allocated) {
 		free((char *)Filename);
 		Filename = NULL;
 		Allocated = false;

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,8 @@ Font3DDataClass::Font3DDataClass( const char *filename )`
`71`	`71`	`***********************************************************************************************/`
`72`	`72`	`Font3DDataClass::~Font3DDataClass(void)`
`73`	`73`	`{`
`74`		`- if (Name != NULL) {`
`75`		`- free(Name);`
`76`		`- Name = NULL;`
`77`		`- }`
	`74`	`+ free(Name);`
	`75`	`+ Name = NULL;`
`78`	`76`
`79`	`77`	`REF_PTR_RELEASE(Texture);`
`80`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,16 +65,14 @@ ResourceFileClass::ResourceFileClass(HMODULE hmodule, char const *filename) :`
`65`	`65`
`66`	`66`	`ResourceFileClass::~ResourceFileClass(void)`
`67`	`67`	`{`
`68`		`- if (ResourceName)`
`69`		`- free(ResourceName);`
	`68`	`+ free(ResourceName);`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`char const * ResourceFileClass::Set_Name(char const *filename)`
`73`	`72`	`{`
`74`		`- if (ResourceName) {`
`75`		`- free(ResourceName);`
`76`		`- ResourceName = NULL;`
`77`		`- }`
	`73`	`+ free(ResourceName);`
	`74`	`+ ResourceName = NULL;`
	`75`	`+`
`78`	`76`	`if (filename) {`
`79`	`77`	`ResourceName = strdup(filename);`
`80`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1724,8 +1724,8 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,`
`1724`	`1724`	`{`
`1725`	`1725`	`if( cells[j].cellType == LISTBOX_TEXT && cells[j].data )`
`1726`	`1726`	`TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );`
`1727`		`-// if (cells[i].userData)`
`1728`		`-// free(cells[i].userData);`
	`1727`	`+`
	`1728`	`+// free(cells[i].userData);`
`1729`	`1729`	`cells[j].data = NULL;`
`1730`	`1730`	`cells[j].userData = NULL;`
`1731`	`1731`	`cells[j].color = 0;`
`@@ -1957,8 +1957,7 @@ WindowMsgHandledType GadgetListBoxSystem( GameWindow *window, UnsignedInt msg,`
`1957`	`1957`	`TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );`
`1958`	`1958`	`}`
`1959`	`1959`	`}`
`1960`		`-// if ( cells[j].userData )`
`1961`		`-// free(cells[j].userData);`
	`1960`	`+// free(cells[j].userData);`
`1962`	`1961`
`1963`	`1962`	`// Null out the data pointers so they're not destroyed when we free up this listdata`
`1964`	`1963`	`cells[j].userData = NULL;`
`@@ -2546,8 +2545,7 @@ void GadgetListBoxSetListLength( GameWindow *listbox, Int newLength )`
`2546`	`2545`	`TheDisplayStringManager->freeDisplayString((DisplayString *) cells[j].data );`
`2547`	`2546`	`}`
`2548`	`2547`	`}`
`2549`		`-// if ( cells[j].userData )`
`2550`		`-// free(cells[j].userData);`
	`2548`	`+// free(cells[j].userData);`
`2551`	`2549`	`}`
`2552`	`2550`	`}`
`2553`	`2551`	`if (i >= newLength) {`
Original file line number	Diff line number	Diff line change
`@@ -1971,10 +1971,8 @@ void ConnectionManager::parseUserList(const GameInfo *game)`
`1971`	`1971`	`return;`
`1972`	`1972`	`}`
`1973`	`1973`
`1974`		`- if (list != NULL) {`
`1975`		`- free(list); // from the strdup above.`
`1976`		`- list = NULL;`
`1977`		`- }`
	`1974`	`+ free(list); // from the strdup above.`
	`1975`	`+ list = NULL;`
`1978`	`1976`	`*/`
`1979`	`1977`	`}`
`1980`	`1978`
Original file line number	Diff line number	Diff line change
`@@ -1401,7 +1401,7 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)`
`1401`	`1401`	`break;`
`1402`	`1402`	`}`
`1403`	`1403`	`}`
`1404`		`- if(freeMe)`
	`1404`	`+`
`1405`	`1405`	`free(freeMe);`
`1406`	`1406`	`}`
`1407`	`1407`	`else`
`@@ -1410,8 +1410,8 @@ Bool ParseAsciiStringToGameInfo(GameInfo *game, AsciiString options)`
`1410`	`1410`	`break;`
`1411`	`1411`	`}`
`1412`	`1412`	`}`
`1413`		`- if( buf )`
`1414`		`- free(buf);`
	`1413`	`+`
	`1414`	`+ free(buf);`
`1415`	`1415`
`1416`	`1416`	`//DEBUG_LOG(("Options were ok == %d", optionsOk));`
`1417`	`1417`	`if (optionsOk && sawMap && sawMapCRC && sawMapSize && sawSeed && sawSlotlist && sawCRC)`
Original file line number	Diff line number	Diff line change
`@@ -1957,10 +1957,8 @@ void ConnectionManager::parseUserList(const GameInfo *game)`
`1957`	`1957`	`return;`
`1958`	`1958`	`}`
`1959`	`1959`
`1960`		`- if (list != NULL) {`
`1961`		`- free(list); // from the strdup above.`
`1962`		`- list = NULL;`
`1963`		`- }`
	`1960`	`+ free(list); // from the strdup above.`
	`1961`	`+ list = NULL;`
`1964`	`1962`	`*/`
`1965`	`1963`	`}`
`1966`	`1964`