[ZH] Reduce crashing within AIPathfind due to inadequate pathing resource cleanup and null pathing info within some cells.

Co-authored-by: Bart Roossien <roossienb@users.noreply.github.com>

Author: Mauller

GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp

@@ -6650,6 +6650,7 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 			Path *path =  buildActualPath( obj, locomotorSet.getValidSurfaces(), from, goalCell, centerInCell, false );
 			parentCell->releaseInfo();
 			cleanOpenAndClosedLists();
+			goalCell->releaseInfo();
 			return path;
 		}	
 
@@ -6726,8 +6727,9 @@ Path *Pathfinder::internalFindPath( Object *obj, const LocomotorSet& locomotorSe
 #endif
 
 	m_isTunneling = false;
-	goalCell->releaseInfo();
+	parentCell->releaseInfo();
 	cleanOpenAndClosedLists();
+	goalCell->releaseInfo();
 	return NULL;
 }
 
@@ -7167,6 +7169,7 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 			Path *path =  buildGroundPath(crusher, from, goalCell, centerInCell, pathDiameter );
 			parentCell->releaseInfo();
 			cleanOpenAndClosedLists();
+			goalCell->releaseInfo();
 			return path;
 		}	
 
@@ -7371,8 +7374,9 @@ Path *Pathfinder::findGroundPath( const Coord3D *from,
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	goalCell->releaseInfo();
+	parentCell->releaseInfo();
 	cleanOpenAndClosedLists();
+	goalCell->releaseInfo();
 	return NULL;
 }
 
@@ -7750,11 +7754,9 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 #endif
 			}
 #endif
-			if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
-				goalCell->releaseInfo();
-			}
 			parentCell->releaseInfo();
 			cleanOpenAndClosedLists();
+			goalCell->releaseInfo();
 			return path;
 		}	
 
@@ -7951,10 +7953,9 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 		}
 #endif
 #endif
-		if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
-			goalCell->releaseInfo();
-		}
+		parentCell->releaseInfo();
 		cleanOpenAndClosedLists();
+		goalCell->releaseInfo();
 		return path;
 	}
 
@@ -8001,8 +8002,9 @@ Path *Pathfinder::internal_findHierarchicalPath( Bool isHuman, const LocomotorSu
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	goalCell->releaseInfo();
+	parentCell->releaseInfo();
 	cleanOpenAndClosedLists();
+	goalCell->releaseInfo();
 	return NULL;
 }
 
@@ -8437,6 +8439,7 @@ Bool Pathfinder::pathDestination( 	Object *obj, const LocomotorSet& locomotorSet
 	}
 #endif
 	m_isTunneling = false;
+	parentCell->releaseInfo();
 	cleanOpenAndClosedLists();
 	goalCell->releaseInfo();
 	return false;
@@ -8570,7 +8573,9 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 		if (parentCell==goalCell) {	 
 			Int cost = parentCell->getTotalCost();
 			m_isTunneling = false;
+			parentCell->releaseInfo();
 			cleanOpenAndClosedLists();
+			goalCell->releaseInfo();
 			return cost;
 		}
 
@@ -8682,10 +8687,9 @@ Int Pathfinder::checkPathCost(Object *obj, const LocomotorSet& locomotorSet, con
 	}
 
 	m_isTunneling = false;
-	if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
-		goalCell->releaseInfo();
-	}
+	parentCell->releaseInfo();
 	cleanOpenAndClosedLists();
+	goalCell->releaseInfo();
 	return MAX_COST;
 }
 
@@ -8888,8 +8892,8 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 			// construct and return path
 			Path *path = buildActualPath( obj, locomotorSet.getValidSurfaces(), from, goalCell, centerInCell, blocked);
 			parentCell->releaseInfo();
-			goalCell->releaseInfo();
 			cleanOpenAndClosedLists();
+			goalCell->releaseInfo();
 			return path;
 		}	
 		// put parent cell onto closed list - its evaluation is finished
@@ -8969,8 +8973,9 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 		rawTo->y = closesetCell->getYIndex()*PATHFIND_CELL_SIZE_F + PATHFIND_CELL_SIZE_F/2.0f;
 		// construct and return path
 		Path *path = buildActualPath( obj, locomotorSet.getValidSurfaces(), from, closesetCell, centerInCell, blocked );
-		goalCell->releaseInfo();
+		parentCell->releaseInfo();
 		cleanOpenAndClosedLists();
+		goalCell->releaseInfo();
 		return path;
 	}
 
@@ -8991,8 +8996,9 @@ Path *Pathfinder::findClosestPath( Object *obj, const LocomotorSet& locomotorSet
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	goalCell->releaseInfo();
+	parentCell->releaseInfo();
 	cleanOpenAndClosedLists();
+	goalCell->releaseInfo();
 	return NULL;
 }
 
@@ -9114,12 +9120,16 @@ void Pathfinder::prependCells( Path *path, const Coord3D *fromPos,
 		}
 		prevCell = cell;
 	}
-	m_zoneManager.setPassable(cell->getXIndex(), cell->getYIndex(), true);
-	if (goalCellNull) {
-		// Very short path.
-		adjustCoordToCell(cell->getXIndex(), cell->getYIndex(), center, pos, cell->getLayer());
-		path->prependNode( &pos, cell->getLayer() );
+
+	if (cell->hasInfo()) {
+		m_zoneManager.setPassable(cell->getXIndex(), cell->getYIndex(), true);
+		if (goalCellNull) {
+			// Very short path.
+			adjustCoordToCell(cell->getXIndex(), cell->getYIndex(), center, pos, cell->getLayer());
+			path->prependNode( &pos, cell->getLayer() );
+		}
 	}
+
 	// put actual start position as first node on the path, so it begins right at the unit's feet
 	if (fromPos->x != path->getFirstNode()->getPosition()->x || fromPos->y != path->getFirstNode()->getPosition()->y) {
 		path->prependNode( fromPos, cell->getLayer() );
@@ -10400,6 +10410,7 @@ Path *Pathfinder::getMoveAwayFromPath(Object* obj, Object *otherObj,
 	DEBUG_LOG(("Unit '%s', time %f\n", obj->getTemplate()->getName().str(), (::GetTickCount()-startTimeMS)/1000.0f));
 
 	m_isTunneling = false;
+	parentCell->releaseInfo();
 	cleanOpenAndClosedLists();
 	return NULL;
 }
@@ -10516,6 +10527,7 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 
 	}	
 	if (startNode == originalPath->getLastNode()) {
+		parentCell->releaseInfo();
 		cleanOpenAndClosedLists();
 		return NULL; // no open nodes.
 	}
@@ -10584,12 +10596,9 @@ Path *Pathfinder::patchPath( const Object *obj, const LocomotorSet& locomotorSet
 	}
 #endif
 	m_isTunneling = false;
-	if (!candidateGoal->getOpen() && !candidateGoal->getClosed())
-	{
-		// Not on one of the lists 
-		candidateGoal->releaseInfo();
-	}
+	parentCell->releaseInfo();
 	cleanOpenAndClosedLists();
+	candidateGoal->releaseInfo();
 	return NULL;
 }
 
@@ -10882,10 +10891,9 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 					}
 				}
 				Path *path = buildActualPath( obj, locomotorSet.getValidSurfaces(), obj->getPosition(), parentCell, centerInCell, false);
-				if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
-					goalCell->releaseInfo();
-				}
+				parentCell->releaseInfo();
 				cleanOpenAndClosedLists();
+				goalCell->releaseInfo();
 				return path;
 			}
 		}	
@@ -10942,10 +10950,9 @@ Path *Pathfinder::findAttackPath( const Object *obj, const LocomotorSet& locomot
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
-	if (goalCell->hasInfo() && !goalCell->getClosed() && !goalCell->getOpen()) {
-		goalCell->releaseInfo();
-	}
+	parentCell->releaseInfo();
 	cleanOpenAndClosedLists();
+	goalCell->releaseInfo();
 	return NULL;
 }
 
@@ -11103,6 +11110,7 @@ Path *Pathfinder::findSafePath( const Object *obj, const LocomotorSet& locomotor
 	TheGameLogic->incrementOverallFailedPathfinds();
 #endif
 	m_isTunneling = false;
+	parentCell->releaseInfo();
 	cleanOpenAndClosedLists();
 	return NULL;
 }