Fix possible division by 0 defect

etternagame · Apr 2, 2018 · 74516bb · 74516bb
1 parent ea648b9
commit 74516bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/ScoreKeeperNormal.cpp b/src/ScoreKeeperNormal.cpp
@@ -391,7 +391,7 @@ void ScoreKeeperNormal::HandleTapNoteScoreInternal( const NoteData &nd, TapNoteS
 	{
 		if (separately)
 		{
-			m_pPlayerStageStats->m_iActualDancePoints += (TapNoteScoreToDancePoints(tns)*nd.GetNumTracksLCD()) / notes;
+			m_pPlayerStageStats->m_iActualDancePoints += notes != 0 ? (TapNoteScoreToDancePoints(tns)*nd.GetNumTracksLCD()) / notes : 0;
 		}
 		else
 		{
@@ -402,7 +402,7 @@ void ScoreKeeperNormal::HandleTapNoteScoreInternal( const NoteData &nd, TapNoteS
 	// increment the current total possible dance score
 	if (separately)
 	{
-		m_pPlayerStageStats->m_iCurPossibleDancePoints += (TapNoteScoreToDancePoints(maximum)*nd.GetNumTracksLCD()) / notes;
+		m_pPlayerStageStats->m_iCurPossibleDancePoints += notes != 0 ? (TapNoteScoreToDancePoints(maximum)*nd.GetNumTracksLCD()) / notes : 0;
 	}
 	else
 	{

diff --git a/src/XMLProfile.cpp b/src/XMLProfile.cpp
@@ -613,7 +613,8 @@ void XMLProfile::LoadStatsXmlForConversion() {
 		return;
 
 	XNode* scores = xml.GetChild("SongScores");
-	LoadSongScoresFromNode(scores);
+	if (scores != nullptr) 
+		LoadSongScoresFromNode(scores);
 }