--- Irrlicht.org/CXFileReader.cpp 2005-08-20 21:17:52.000000000 +0200 +++ Irrlicht/CXFileReader.cpp 2006-04-20 23:38:59.439077000 +0200 @@ -864,16 +864,25 @@ //! reads a x file style string bool CXFileReader::getNextTokenAsString(core::stringc& out) { - core::stringc s = getNextToken(); - s32 sl = s.size(); - - if (sl < 3) + findNextNoneWhiteSpace(); + + if (P >= End) + return false; + + if (P[0] != '"') return false; + ++P; + + while(P < End && P[0]!='"') + { + out.append(P[0]); + ++P; + } - if (s[0] != '"' || s[sl-1] != ';' || s[sl-2] != '"') + if ( P[1] != ';' || P[0] != '"') return false; + P+=2; - out = s.subString(1, sl-3); return true; }