Merge pull request #1888 from mwkroening/notes_loader-invalid_argument

Accept non numbers in NotesLoaderSM

src/CMakeLists.txt

@@ -247,8 +247,6 @@ elseif(APPLE)
       "${SM_XCODE_DIR}/plistHelper.hpp"
       XCODE_ATTRIBUTE_GCC_PREFIX_HEADER
       "${CMAKE_CURRENT_SOURCE_DIR}/archutils/Darwin/StepMania.pch"
-      XCODE_ATTRIBUTE_GCC_ENABLE_CPP_EXCEPTIONS
-      "NO"
       XCODE_ATTRIBUTE_LIBRARY_SEARCH_PATHS
       "${SM_XCODE_DIR}/Libraries")
 

src/NoteDataUtil.cpp

@@ -11,6 +11,17 @@
 #include "TimingData.h"
 #include <utility>
 
+bool NoteDataUtil::StringInterpretsAs( const std::string& str, int integer ) {
+	try
+	{
+		return std::stoi( str ) == integer;
+	}
+	catch ( const std::invalid_argument & )
+	{
+		return false;
+	}
+}
+
 // TODO: Remove these constants that aren't time signature-aware
 static const int BEATS_PER_MEASURE = 4;
 static const int ROWS_PER_MEASURE = ROWS_PER_BEAT * BEATS_PER_MEASURE;

src/NoteDataUtil.h

@@ -23,6 +23,11 @@ void LightTransformHelper( const NoteData &in, NoteData &out, const vector<int>
  * and makes it much easier to change NoteData internally in the future. */
 namespace NoteDataUtil
 {
+	/**
+	 * @brief Whether a string can be interpreted as the provided signed integer
+	 */
+	bool StringInterpretsAs( const std::string& str, int integer );
+
 	NoteType GetSmallestNoteTypeForMeasure( const NoteData &nd, int iMeasureIndex );
 	NoteType GetSmallestNoteTypeInRange( const NoteData &nd, int iStartIndex, int iEndIndex );
 	void LoadFromSMNoteDataString( NoteData &out, const RString &sSMNoteData, bool bComposite );

src/NotesLoaderSM.cpp

@@ -3,6 +3,7 @@
 #include "BackgroundUtil.h"
 #include "GameManager.h"
 #include "MsdFile.h"
+#include "NoteDataUtil.h"
 #include "NoteTypes.h"
 #include "RageFileManager.h"
 #include "RageLog.h"
@@ -974,28 +975,26 @@ bool SMLoader::LoadFromBGChangesVector( BackgroundChange &change, std::vector<RS
 	case 6:
 		// param 7 overrides this.
 		// Backward compatibility:
-		if( change.m_def.m_sEffect.empty() )
+		if( change.m_def.m_sEffect.empty() && !NoteDataUtil::StringInterpretsAs( aBGChangeValues[5], 0 ) )
 		{
-			bool bLoop = std::stoi( aBGChangeValues[5] ) != 0;
-			if( !bLoop )
-				change.m_def.m_sEffect = SBE_StretchNoLoop;
+			change.m_def.m_sEffect = SBE_StretchNoLoop;
 		}
 		// fall through
 	case 5:
 		// param 7 overrides this.
 		// Backward compatibility:
-		if( change.m_def.m_sEffect.empty() )
+		if( change.m_def.m_sEffect.empty() && !NoteDataUtil::StringInterpretsAs( aBGChangeValues[4], 0 ) )
 		{
-			bool bRewindMovie = std::stoi( aBGChangeValues[4] ) != 0;
-			if( bRewindMovie )
-				change.m_def.m_sEffect = SBE_StretchRewind;
+			change.m_def.m_sEffect = SBE_StretchRewind;
 		}
 		// fall through
 	case 4:
 		// param 9 overrides this.
 		// Backward compatibility:
-		if( change.m_sTransition.empty() )
-			change.m_sTransition = (std::stoi( aBGChangeValues[3] ) != 0) ? "CrossFade" : "";
+		if( change.m_sTransition.empty() && !NoteDataUtil::StringInterpretsAs( aBGChangeValues[3], 0 ) )
+		{
+			change.m_sTransition = SBT_CrossFade;
+		}
 		// fall through
 	case 3:
 		change.m_fRate = StringToFloat( aBGChangeValues[2] );