Changeset 5754 for pjproject

Timestamp:

Mar 14, 2018 8:28:52 AM (7 years ago)

Author:

nanang

Message:

Re #2059: Fixed assertion in JSON name verification due to NULL string pointer passed to string::compare() in reading array node.

File:

• pjproject/trunk/pjsip/src/pjsua2/json.cpp (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua2/json.cpp

@@ -311 +311 @@
      * elements to have name).
      */
-    if (name.size() && name.compare(0, name.size(),
-                                    jdat->childPtr->name.ptr,
-                                    jdat->childPtr->name.slen) &&
-        jdat->childPtr->name.slen &&
-        jdat->jnode->type != PJ_JSON_VAL_ARRAY)
+    if (jdat->jnode->type != PJ_JSON_VAL_ARRAY &&
+        name.size() && jdat->childPtr->name.slen &&
+        name.compare(0, name.size(), jdat->childPtr->name.ptr,
+                                     jdat->childPtr->name.slen))
     {
         char err_msg[80];