fix(netpacket): Fix misplaced null test in NetPacket::addCommand() (TheSuperHackers#2272)

xezon · web-flow · commit 8536a29a68b2 · 2026-02-08T15:52:13.000+01:00
diff --git a/Core/GameEngine/Source/GameNetwork/NetPacket.cpp b/Core/GameEngine/Source/GameNetwork/NetPacket.cpp
@@ -1015,12 +1015,12 @@ void NetPacket::setAddress(Int addr, Int port) {
 Bool NetPacket::addCommand(NetCommandRef *msg) {
 	// This is where the fun begins...
 
-	NetCommandMsg *cmdMsg = msg->getCommand();
-
 	if (msg == nullptr) {
 		return TRUE; // There was nothing to add, so it was successful.
 	}
 
+	NetCommandMsg *cmdMsg = msg->getCommand();
+
 	switch(cmdMsg->getNetCommandType())
 	{
 		case NETCOMMANDTYPE_GAMECOMMAND:

Original file line number	Diff line number	Diff line change
`@@ -1015,12 +1015,12 @@ void NetPacket::setAddress(Int addr, Int port) {`
`1015`	`1015`	`Bool NetPacket::addCommand(NetCommandRef *msg) {`
`1016`	`1016`	`// This is where the fun begins...`
`1017`	`1017`
`1018`		`- NetCommandMsg *cmdMsg = msg->getCommand();`
`1019`		`-`
`1020`	`1018`	`if (msg == nullptr) {`
`1021`	`1019`	`return TRUE; // There was nothing to add, so it was successful.`
`1022`	`1020`	`}`
`1023`	`1021`
	`1022`	`+ NetCommandMsg *cmdMsg = msg->getCommand();`
	`1023`	`+`
`1024`	`1024`	`switch(cmdMsg->getNetCommandType())`
`1025`	`1025`	`{`
`1026`	`1026`	`case NETCOMMANDTYPE_GAMECOMMAND:`