fix(Save/Restore): Fix dereferencing null if m_iActiveSound is no lon…

…ger valid index by save restore. See ValveSoftware#381
FriskTheFallenHuman · Nov 30, 2022 · 2769eed · 2769eed
1 parent d577a40
commit 2769eed
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 32 deletions.
diff --git a/mp/src/game/server/ai_basenpc.cpp b/mp/src/game/server/ai_basenpc.cpp
@@ -3634,7 +3634,10 @@ void CAI_BaseNPC::UpdateEfficiency( bool bInPVS )
 				}
 			}
 
-			iSound = pCurrentSound->NextSound();
+			if ( pCurrentSound )
+				iSound = pCurrentSound->NextSound();
+			else
+				break;
 		}
 	}
 
@@ -3824,7 +3827,10 @@ void CAI_BaseNPC::UpdateSleepState( bool bInPVS )
 							break;
 						}
 
-						iSound = pCurrentSound->NextSound();
+						if ( pCurrentSound )
+							iSound = pCurrentSound->NextSound();
+						else
+							break;
 					}
 				}
 			}

diff --git a/mp/src/game/server/ai_senses.cpp b/mp/src/game/server/ai_senses.cpp
@@ -128,12 +128,15 @@ void CAI_Senses::Listen( void )
 
 			if ( pCurrentSound	&& (iSoundMask & pCurrentSound->SoundType()) && CanHearSound( pCurrentSound ) )
 			{
-	 			// the npc cares about this sound, and it's close enough to hear.
+				// the npc cares about this sound, and it's close enough to hear.
 				pCurrentSound->m_iNextAudible = m_iAudibleList;
 				m_iAudibleList = iSound;
 			}
 
-			iSound = pCurrentSound->NextSound();
+			if ( pCurrentSound )
+				iSound = pCurrentSound->NextSound();
+			else
+				break;
 		}
 	}
 
@@ -423,16 +426,16 @@ int CAI_Senses::LookForHighPriorityEntities( int iDistance )
 		}
 
 		EndGather( nSeen, &m_SeenHighPriority );
-    }
-    else
-    {
-    	for ( int i = m_SeenHighPriority.Count() - 1; i >= 0; --i )
-    	{
-    		if ( m_SeenHighPriority[i].Get() == NULL )
-    			m_SeenHighPriority.FastRemove( i );    			
-    	}
-    	nSeen = m_SeenHighPriority.Count();
-    }
+	}
+	else
+	{
+		for ( int i = m_SeenHighPriority.Count() - 1; i >= 0; --i )
+		{
+			if ( m_SeenHighPriority[i].Get() == NULL )
+				m_SeenHighPriority.FastRemove( i );    			
+		}
+		nSeen = m_SeenHighPriority.Count();
+	}
 
 	return nSeen;
 }
@@ -480,24 +483,24 @@ int CAI_Senses::LookForNPCs( int iDistance )
 		// Fall through
 	}
 
-    for ( int i = m_SeenNPCs.Count() - 1; i >= 0; --i )
-    {
-    	if ( m_SeenNPCs[i].Get() == NULL )
+	for ( int i = m_SeenNPCs.Count() - 1; i >= 0; --i )
+	{
+		if ( m_SeenNPCs[i].Get() == NULL )
 		{
-    		m_SeenNPCs.FastRemove( i );
+			m_SeenNPCs.FastRemove( i );
 		}
 		else if ( bRemoveStaleFromCache )
 		{
 			if ( ( !((CAI_BaseNPC *)m_SeenNPCs[i].Get())->ShouldNotDistanceCull() && 
 				   origin.DistToSqr(m_SeenNPCs[i]->GetAbsOrigin()) > distSq ) ||
 				 !Look( m_SeenNPCs[i] ) )
 			{
-	    		m_SeenNPCs.FastRemove( i );
+				m_SeenNPCs.FastRemove( i );
 			}
 		}
-    }
+	}
 
-    return m_SeenNPCs.Count();
+	return m_SeenNPCs.Count();
 }
 
 //-----------------------------------------------------------------------------
@@ -532,15 +535,15 @@ int CAI_Senses::LookForObjects( int iDistance )
 
 		EndGather( nSeen, &m_SeenMisc );
 	}
-    else
-    {
-    	for ( int i = m_SeenMisc.Count() - 1; i >= 0; --i )
-    	{
-    		if ( m_SeenMisc[i].Get() == NULL )
-    			m_SeenMisc.FastRemove( i );    			
-    	}
-    	nSeen = m_SeenMisc.Count();
-    }
+	else
+	{
+		for ( int i = m_SeenMisc.Count() - 1; i >= 0; --i )
+		{
+			if ( m_SeenMisc[i].Get() == NULL )
+				m_SeenMisc.FastRemove( i );    			
+		}
+		nSeen = m_SeenMisc.Count();
+	}
 
 	return nSeen;
 }

diff --git a/mp/src/game/server/envmicrophone.cpp b/mp/src/game/server/envmicrophone.cpp
@@ -473,9 +473,11 @@ void CEnvMicrophone::Think(void)
 					fHearSound = true;
 				}
 			}
-		}
 
-		nSound = pCurrentSound->NextSound();
+			nSound = pCurrentSound->NextSound();
+		}
+		else
+			break;
 	}
 
 	if( fHearSound )