commit 7de26f7dc7d117d4f3b42efa033e89986f048f31
author Lee Thomason <leethomason@gmail.com> Fri Feb 21 22:47:21 2014 -0800
committer Lee Thomason <leethomason@gmail.com> Fri Feb 21 22:47:21 2014 -0800
tree 0dbd86960dc2e15e65004f76996f7af8e0a2ced4
parent 82d32005719bf101a12b19692ec6ca27e3257bdc
parent c18eb233269d081c3f3b539e37eab185b678b026

Merge remote-tracking branch 'origin/master'

tinyxml2.cpp

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index cb26e00..4e79ef5 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -1758,12 +1758,7 @@
 	const char* start = p;

     Clear();

 

-    if ( len == 0 ) {

-        SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );

-        return _errorID;

-    }

-

-    if ( !p || !*p ) {

+    if ( len == 0 || !p || !*p ) {

         SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );

         return _errorID;

     }