Merge branch 'master' into next

This commit is contained in:
Monster Iestyn 2017-05-11 20:47:12 +01:00
commit 55fd0aba91

View file

@ -716,6 +716,12 @@ void Net_CloseConnection(INT32 node)
if (!node) if (!node)
return; return;
if (node < 0 || node >= MAXNETNODES) // prevent invalid nodes from crashing the game
{
CONS_Alert(CONS_WARNING, M_GetText("Net_CloseConnection: invalid node %d detected!\n"), node);
return;
}
nodes[node].flags |= NF_CLOSE; nodes[node].flags |= NF_CLOSE;
// try to Send ack back (two army problem) // try to Send ack back (two army problem)