Explorar o código

Merge pull request #104 from Vasily-Biryukov/master

LoadFile() returns XML_NO_ERROR for empty documents
Lee Thomason %!s(int64=13) %!d(string=hai) anos
pai
achega
761c4c2ed5
Modificáronse 3 ficheiros con 8 adicións e 0 borrados
  1. 0 0
      resources/empty.xml
  2. 1 0
      tinyxml2.cpp
  3. 7 0
      xmltest.cpp

+ 0 - 0
resources/empty.xml


+ 1 - 0
tinyxml2.cpp

@@ -1608,6 +1608,7 @@ XMLError XMLDocument::LoadFile( FILE* fp )
     fseek( fp, 0, SEEK_SET );
 
     if ( size == 0 ) {
+        SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );
         return _errorID;
     }
 

+ 7 - 0
xmltest.cpp

@@ -1158,6 +1158,13 @@ int main( int argc, const char ** argv )
 	}
 
 
+	{
+		XMLDocument doc;
+		XMLError error = doc.LoadFile( "resources/empty.xml" );
+		XMLTest( "Loading an empty file", XML_ERROR_EMPTY_DOCUMENT, error );
+	}
+
+
 	// ----------- Performance tracking --------------
 	{
 #if defined( _MSC_VER )