FS-8160: properly handle malformed json when parsing json with \u at the end of a...

diff --git a/libs/esl/src/esl_json.c b/libs/esl/src/esl_json.c
index 176c4603a59269374bdc61aff6f04aa20bedd282..df5a88135dffa1f5c938ba7d94453f7f8b7190c1 100644 (file)
--- a/libs/esl/src/esl_json.c
+++ b/libs/esl/src/esl_json.c
@@ -204,7 +204,7 @@ static const char *parse_string(cJSON *item,const char *str)
                                        break;
                                default:  *ptr2++=*ptr; break;
                        }
-                       ptr++;
+                       if (*ptr) ptr++;
                }
        }
        *ptr2=0;

diff --git a/libs/libks/src/ks_json.c b/libs/libks/src/ks_json.c
index ffa965a6091447e66de7c590f50afe10de6ea0e8..63529e7b5ba1bb5e67a1f86b643ea6b2dd815ac5 100644 (file)
--- a/libs/libks/src/ks_json.c
+++ b/libs/libks/src/ks_json.c
@@ -204,7 +204,7 @@ static const char *parse_string(cJSON *item,const char *str)
                                        break;
                                default:  *ptr2++=*ptr; break;
                        }
-                       ptr++;
+                       if (*ptr) ptr++;
                }
        }
        *ptr2=0;

diff --git a/src/switch_json.c b/src/switch_json.c
index 487843df648778ed64bf0c44f42498e7fee7d7e9..c3c25364dac78a5c2cbf2da9fc5e7bb377299a3a 100644 (file)
--- a/src/switch_json.c
+++ b/src/switch_json.c
@@ -204,7 +204,7 @@ static const char *parse_string(cJSON *item,const char *str)
                                        break;
                                default:  *ptr2++=*ptr; break;
                        }
-                       ptr++;
+                       if (*ptr) ptr++;
                }
        }
        *ptr2=0;