From ce4667e9ca6919b2b7b551e4abfb56c620086d29 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Wed, 20 Apr 2011 18:56:47 -0500 Subject: [PATCH] [CourseContentsList] Fix a crash. --- Docs/Changelog_sm-ssc.txt | 4 ++++ src/CourseContentsList.cpp | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index 9bb703d3d1..90974aa23e 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -13,6 +13,10 @@ _____________________________________________________________________________ sm-ssc v1.2.5 | 201104?? -------------------------------------------------------------------------------- +20110420 +-------- +* [CourseContentsList] Fix a crash. [AJ] + 20110416 -------- * [PlayerOptions] Added UsingReverse() Lua binding (automatically tests GetReverse() == 1) [AJ] diff --git a/src/CourseContentsList.cpp b/src/CourseContentsList.cpp index a4e09474c5..ee4b99cb2f 100644 --- a/src/CourseContentsList.cpp +++ b/src/CourseContentsList.cpp @@ -78,7 +78,9 @@ void CourseContentsList::SetItemFromGameState( Actor *pActor, int iCourseEntryIn FOREACH_HumanPlayer(pn) { const Trail *pTrail = GAMESTATE->m_pCurTrail[pn]; - if( pTrail == NULL || iCourseEntryIndex >= (int) pTrail->m_vEntries.size() ) + if( pTrail == NULL + || iCourseEntryIndex >= (int) pTrail->m_vEntries.size() + || iCourseEntryIndex >= (int) pCourse->m_vEntries.size() ) continue; const TrailEntry *te = &pTrail->m_vEntries[iCourseEntryIndex];