wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-10-16 10:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #3545

Browse Source
This commit is contained in:
cpq committed 2026-05-20 07:26:13 +01:00
1 parent 04ca25e4d8
commit b773e33f4e
3 files changed
+15 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+2 -2
View File
@@ -3969,9 +3969,9 @@ size_t mg_json_unescape(struct mg_str json, const char *path, char *to,
char *mg_json_get_str(struct mg_str json, const char *path) {
char *result = NULL;
int len = 0, off = mg_json_get(json, path, &len);
if (off >= 0 && len > 2 && json.buf[off] == '"') {
if (off >= 0 && len >= 2 && json.buf[off] == '"') {
if ((result = (char *) mg_calloc(1, (size_t) len)) != NULL &&
mg_json_unescape(json, path, result, (size_t) len) == 0) {
len > 2 && mg_json_unescape(json, path, result, (size_t) len) == 0) {
mg_free(result);
result = NULL;
}
src/json.c
+2 -2
View File
@@ -338,9 +338,9 @@ size_t mg_json_unescape(struct mg_str json, const char *path, char *to,
char *mg_json_get_str(struct mg_str json, const char *path) {
char *result = NULL;
int len = 0, off = mg_json_get(json, path, &len);
if (off >= 0 && len > 2 && json.buf[off] == '"') {
if (off >= 0 && len >= 2 && json.buf[off] == '"') {
if ((result = (char *) mg_calloc(1, (size_t) len)) != NULL &&
mg_json_unescape(json, path, result, (size_t) len) == 0) {
len > 2 && mg_json_unescape(json, path, result, (size_t) len) == 0) {
mg_free(result);
result = NULL;
}
test/unit_test.c
+11 -1
View File
@@ -3565,13 +3565,23 @@ static void test_json(void) {
int len;
char *str = NULL;
json = mg_str("{\"a\":\"b\"}");
json = mg_str("{\"a\":\"b\", \"c\":\"\"}");
str = mg_json_get_str(json, "$.a");
ASSERT(str != NULL);
// printf("---> [%s]\n", str);
ASSERT(strcmp(str, "b") == 0);
mg_free(str);
// Non existent string
str = mg_json_get_str(json, "$.d");
ASSERT(str == NULL);
// Empty string
str = mg_json_get_str(json, "$.c");
ASSERT(str != NULL);
ASSERT(strcmp(str, "") == 0);
mg_free(str);
json = mg_str("{\"a\": \"hi\\nthere\",\"b\": [12345, true]}");
str = mg_json_get_str(json, "$.a");