From d5211311c69231f451acea3efdbc5b3f67e3202a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 18 Apr 2004 23:06:56 +0000 Subject: [PATCH] fix infinite looping on error --- stepmania/src/IniFile.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/stepmania/src/IniFile.cpp b/stepmania/src/IniFile.cpp index 7744419010..f79cc9abc7 100644 --- a/stepmania/src/IniFile.cpp +++ b/stepmania/src/IniFile.cpp @@ -46,9 +46,18 @@ bool IniFile::ReadFile() } CString keyname; - CString line; - while( f.GetLine(line) ) + while( 1 ) { + CString line; + switch( f.GetLine(line) ) + { + case -1: + error = f.GetError(); + return false; + case 0: + return true; /* eof */ + } + if(line.size() >= 3 && line[0] == '\xef' && line[1] == '\xbb' && @@ -80,8 +89,6 @@ bool IniFile::ReadFile() } } } - - return true; } // writes data stored in class to ini file