parse error return null

yksten · Dec 23, 2022 · e21dc31 · e21dc31
1 parent 56d0169
commit e21dc31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/include/struct2x/json/genericreader.h b/include/struct2x/json/genericreader.h
@@ -26,7 +26,7 @@ namespace custom {
 
 
     struct GenericValue {
-        enum { VALUE_NULL = 0, VALUE_BOOL, VALUE_NUMBER, VALUE_STRING, VALUE_ARRAY, VALUE_OBJECT };
+        enum { VALUE_NULL = 0, VALUE_BOOL = 1, VALUE_NUMBER = 2, VALUE_STRING = 3, VALUE_ARRAY = 4, VALUE_OBJECT = 5 };
 
         int32_t type;
 

diff --git a/src/thirdParty/json/genericreader.cpp b/src/thirdParty/json/genericreader.cpp
@@ -138,6 +138,9 @@ namespace custom {
         if (is.Peek() != '\0') {
             ParseValue(is);
         }
+        if (!_strError.empty()) {
+            return NULL;
+        }
         return root;
     }
 
@@ -153,8 +156,9 @@ namespace custom {
                 ParseNumber(is);
                 break;
         }
-        if (_strError[0])
+        if (!_strError.empty()) {
             return;
+        }
     }
 
     void GenericReader::ParseKey(StringStream& is) {