From 5e8ab2af31c437575e6fcfd3d65f3ac16b365b1d Mon Sep 17 00:00:00 2001 From: Flugente Date: Fri, 7 Aug 2015 20:16:15 +0000 Subject: [PATCH] Fix: possible access to invalid memory if waypoint is list was corrupted git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7962 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Strategic Movement.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Strategic/Strategic Movement.cpp b/Strategic/Strategic Movement.cpp index 24306e84e..74462151a 100644 --- a/Strategic/Strategic Movement.cpp +++ b/Strategic/Strategic Movement.cpp @@ -3203,8 +3203,10 @@ INT32 CalculateTravelTimeOfGroup( GROUP *pGroup ) while ( i-- ) { //Traverse through the waypoint list to the next waypoint ID - if( pNode ); - pNode = pNode->next; + if( !pNode ) + return uiEtaTime; + + pNode = pNode->next; } if ( !pNode )