Merge branch 'master' of https://github.com/leethomason/tinyxml2

2014-01-14 12:30:18 -08:00
parent c3708ccf08 2ece2f1690
commit 44ce7930b7
2 changed files with 8 additions and 0 deletions
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -1637,6 +1637,13 @@ XMLError XMLDocument::LoadFile( FILE* fp )
 {
    Clear();

+    fseek( fp, 0, SEEK_SET );
+    fgetc( fp );
+    if ( ferror( fp ) != 0 ) {
+        SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 );
+        return _errorID;
+    }
+
    fseek( fp, 0, SEEK_END );
    size_t size = ftell( fp );
    fseek( fp, 0, SEEK_SET );