kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better fix for crash on Windows. This time it will even work on Linux, too. That GetLineFromStream method while loop sure is fussy.

This commit is contained in:
David Cole 2009-10-16 13:23:52 -04:00
parent 402fa2ceeb
commit 847918b38f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/kwsys/SystemTools.cxx
View File

@ -3960,10 +3960,22 @@ bool SystemTools::GetLineFromStream(kwsys_ios::istream& is,
long leftToRead = sizeLimit; long leftToRead = sizeLimit;
// Early short circuit return if stream is no good. Just return
// false and the empty line. (Probably means caller tried to
// create a file stream with a non-existent file name...)
//
if(!is)
{
if(has_newline)
{
*has_newline = false;
}
return false;
}
// If no characters are read from the stream, the end of file has // If no characters are read from the stream, the end of file has
// been reached. Clear the fail bit just before reading. // been reached. Clear the fail bit just before reading.
while(is && while(!haveNewline &&
!haveNewline &&
leftToRead != 0 && leftToRead != 0 &&
(is.clear(is.rdstate() & ~kwsys_ios::ios::failbit), (is.clear(is.rdstate() & ~kwsys_ios::ios::failbit),
is.getline(buffer, bufferSize), is.gcount() > 0)) is.getline(buffer, bufferSize), is.gcount() > 0))