AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tighten up the error checks

This commit is contained in:
Lee Thomason 2015-05-22 11:00:32 -07:00
parent 2ecc203835
commit 7a93b33160
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tinyxml2.cpp
View File

@ -1857,7 +1857,7 @@ XMLError XMLDocument::LoadFile( FILE* fp )
return _errorID; return _errorID;
} }
if ( filelength >= (size_t)-1 ) { if ( (size_t)filelength >= (size_t)-1 ) {
// Cannot handle files which won't fit in buffer together with null terminator // Cannot handle files which won't fit in buffer together with null terminator
SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 );
return _errorID; return _errorID;

4
xmltest.cpp
View File

@ -1474,9 +1474,9 @@ int main( int argc, const char ** argv )
doc.Parse(xml0); doc.Parse(xml0);
XMLTest("Test that the code changes do not affect normal parsing", doc.Error(), false); XMLTest("Test that the code changes do not affect normal parsing", doc.Error(), false);
doc.Parse(xml1); doc.Parse(xml1);
XMLTest("Test that the second declaration throws an error", doc.Error(), true); XMLTest("Test that the second declaration throws an error", doc.ErrorID(), XML_ERROR_PARSING_DECLARATION);
doc.Parse(xml2); doc.Parse(xml2);
XMLTest("Test that declaration after a child throws an error", doc.Error(), true); XMLTest("Test that declaration after a child throws an error", doc.ErrorID(), XML_ERROR_PARSING_DECLARATION);
} }
// ----------- Performance tracking -------------- // ----------- Performance tracking --------------