commit 75b4e23957f8540a61402e571d34f2fe84c67fa2
author Lee Thomason <leethomason@gmail.com> Mon Jan 05 17:07:50 2015 -0800
committer Lee Thomason <leethomason@gmail.com> Mon Jan 05 17:07:50 2015 -0800
tree bbee86bd637e7279bc075a1eb346c5c0e1192a8a
parent 6e504e9baf0da0470e82d7e03fd3c0234dfd1f45
parent 7a7e5dc52537a534bd92dfb17fd0d0d8f39c2723

Merge pull request #260 from Dmitry-Me/placeChecksInMoreNaturalOrder

Rearrange checks in more natural order

tinyxml2.cpp

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 76262a9..5633397 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -927,11 +927,10 @@
         }

 

         p = _value.ParseText( p, "<", flags );

-        if ( !p ) {

-            _document->SetError( XML_ERROR_PARSING_TEXT, start, 0 );

-        }

         if ( p && *p ) {

             return p-1;

+        } else if ( !p ) {

+            _document->SetError( XML_ERROR_PARSING_TEXT, start, 0 );

         }

     }

     return 0;