[server] Fix infinite loops and null dereference when CSoundEnt::Soun…

…dPointerForIndex is nullptr
Source-Authors · Dec 9, 2024 · 5fd74bf · 5fd74bf
1 parent 393c18a
commit 5fd74bf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/game/server/ai_basenpc.cpp b/game/server/ai_basenpc.cpp
@@ -3202,11 +3202,11 @@ void CAI_BaseNPC::UpdateEfficiency( bool bInPVS )
 		{
 			CSound *pCurrentSound = CSoundEnt::SoundPointerForIndex( iSound );
 
-			float hearingSensitivity = HearingSensitivity();
-			Vector vEarPosition = EarPosition();
-
 			if ( pCurrentSound && (SOUND_DANGER & pCurrentSound->SoundType()) )
 			{
+				float hearingSensitivity = HearingSensitivity();
+				Vector vEarPosition = EarPosition();
+
 				float flHearDistanceSq = pCurrentSound->Volume() * hearingSensitivity;
 				flHearDistanceSq *= flHearDistanceSq;
 				if ( pCurrentSound->GetSoundOrigin().DistToSqr( vEarPosition ) <= flHearDistanceSq )
@@ -3220,6 +3220,11 @@ void CAI_BaseNPC::UpdateEfficiency( bool bInPVS )
 			{
 				iSound = pCurrentSound->NextSound();
 			}
+			else
+			{
+				// dimhotepus: Break if no current sound.
+				break;
+			}
 		}
 	}
 

diff --git a/game/server/ai_senses.cpp b/game/server/ai_senses.cpp
@@ -137,7 +137,15 @@ void CAI_Senses::Listen( void )
 				m_iAudibleList = iSound;
 			}
 
-			iSound = pCurrentSound->NextSound();
+			if ( pCurrentSound )
+			{
+				iSound = pCurrentSound->NextSound();
+			}
+			else
+			{
+				// dimhotepus: Break if no current sound.
+				break;
+			}
 		}
 	}
 

diff --git a/game/server/envmicrophone.cpp b/game/server/envmicrophone.cpp
@@ -403,9 +403,14 @@ void CEnvMicrophone::Think(void)
 					fHearSound = true;
 				}
 			}
-		}
 
-		nSound = pCurrentSound->NextSound();
+			nSound = pCurrentSound->NextSound();
+		}
+		else
+		{
+			// dimhotepus: Break if no current sound.
+			break;
+		}
 	}
 
 	if( fHearSound )