Changeset 472 for cpp/frams

Timestamp:

02/14/16 03:41:36 (9 years ago)

Author:

Maciej Komosinski

Message:

Deserialization more tolerant to whitespaces (similarly to the json standard)

File:

• cpp/frams/util/extvalue.cpp (modified) (6 diffs)

cpp/frams/util/extvalue.cpp

@@ -252 +252 @@
                         tlsGetRef(ExtObject_serialization).remove(*this);//JSON only tracks recursion, does not track reuse
                         break;
-                case NativeSerialization:; //nop (avoid warning)
+                case NativeSerialization:; //nop (just to avoid compiler warning)
                 }
 
@@ -1010 +1010 @@
 const char* ExtValue::deserialize_inner(const char* in)
 {
+        while(isspace(*in)) in++;
         const char* ret = parseNumber(in);
         if (ret)
@@ -1036 +1037 @@
                 while (*p)
                 {
+                        if (isspace(*p)) p++;
                         if (*p == ']') { p++; break; }
                         ret = tmp.deserialize(p);
@@ -1067 +1069 @@
                 while (*p)
                 {
+                        if (isspace(*p)) p++;
                         if (*p == '}') { p++; break; }
                         ret = args[1].deserialize(p);
@@ -1092 +1095 @@
                 return in + 4;
         }
+        else if (!strncmp(in, "true", 4))
+        {
+                setInt(1);
+                return in + 4;
+        }
+        else if (!strncmp(in, "false", 5))
+        {
+                setInt(0);
+                return in + 5;
+        }
         else if (!strncmp(in, "invalid", 9))
         {
@@ -1179 +1192 @@
         tlsGetRef(ExtObject_serialization).begin();
         const char* ret = deserialize_inner(in);
+        if (ret) while(isspace(*ret)) ret++;
         tlsGetRef(ExtObject_serialization).end();
         return ret;