Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash caused by not checking return value from IdToDroid. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3257 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2007-12-30 21:33:08 +00:00
parent 2aeb1bb801
commit 4c239b47ac
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/multibot.c
View File

@ -695,14 +695,16 @@ BOOL recvGroupOrder()
if (!NETuint32_t(&id))
{
// If somehow we fail assume the message got truncated prematurely
debug(LOG_NET, "recvGroupOrder: error retrieving droid ID number; while there are (supposed to be) still %hhu droids left", droidCount);
debug(LOG_NET, "recvGroupOrder: error retrieving droid ID number; while there are (supposed to be) still %u droids left",
(unsigned int)droidCount);
NETend();
return FALSE;
}
if (!IdToDroid(id, ANYPLAYER, &psDroid))
{
// If the droid's not found, request it
NETend();
sendRequestDroid(id);
return FALSE;
}
@ -873,8 +875,10 @@ static void ProcessDroidOrder(DROID *psDroid, DROID_ORDER order, uint32_t x, uin
switch (desttype)
{
case OBJ_DROID:
IdToDroid(destid,ANYPLAYER,&pD);
psObj = (BASE_OBJECT*)pD;
if (IdToDroid(destid, ANYPLAYER, &pD))
{
psObj = (BASE_OBJECT*)pD;
}
break;
case OBJ_STRUCTURE:
psObj = (BASE_OBJECT*)IdToStruct(destid,ANYPLAYER);