From 3c57190b795dd88f6561ef1dae61c8cd45f1ae52 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 14 Sep 2015 17:56:37 -0400 Subject: [PATCH] FS-8160: properly handle malformed json when parsing json with \u at the end of a json string --- libs/esl/src/esl_json.c | 2 +- libs/libks/src/ks_json.c | 2 +- src/switch_json.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/esl/src/esl_json.c b/libs/esl/src/esl_json.c index 176c4603a5..df5a88135d 100644 --- 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 ffa965a609..63529e7b5b 100644 --- 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 487843df64..c3c25364da 100644 --- 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;