diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-01-22 15:56:26 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-01-22 15:56:26 +0100 |
| commit | e2c6037da387aad05e4f6bd4a8a6267051d6de04 (patch) | |
| tree | c138bdfbc103396f0995c142e23ce475a05b4be4 | |
| parent | e362c3d2c34f2b7ff38b4c3d2a7ff127d2290e09 (diff) | |
patch 8.0.0216: decoding js style json may failv8.0.0216
Problem: When decoding JSON with a JS style object the JSON test may use a
NULL pointer. (Coverity)
Solution: Check for a NULL pointer.
| -rw-r--r-- | src/json.c | 12 | ||||
| -rw-r--r-- | src/json_test.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/src/json.c b/src/json.c index a9333cf076..fd1b6ec3db 100644 --- a/src/json.c +++ b/src/json.c @@ -629,10 +629,13 @@ json_decode_item(js_read_T *reader, typval_T *res, int options) key = p = reader->js_buf + reader->js_used; while (*p != NUL && *p != ':' && *p > ' ') ++p; - cur_item->v_type = VAR_STRING; - cur_item->vval.v_string = vim_strnsave(key, (int)(p - key)); + if (cur_item != NULL) + { + cur_item->v_type = VAR_STRING; + cur_item->vval.v_string = vim_strnsave(key, (int)(p - key)); + top_item->jd_key = cur_item->vval.v_string; + } reader->js_used += (int)(p - key); - top_item->jd_key = cur_item->vval.v_string; } else { @@ -1053,7 +1056,8 @@ json_decode(js_read_T *reader, typval_T *res, int options) /* * Decode the JSON from "reader" to find the end of the message. - * "options" can be JSON_JS or zero; + * "options" can be JSON_JS or zero. + * This is only used for testing. * Return FAIL if the message has a decoding error. * Return MAYBE if the message is truncated, need to read more. * This only works reliable if the message contains an object, array or diff --git a/src/json_test.c b/src/json_test.c index 74463f3d2b..c7779b29af 100644 --- a/src/json_test.c +++ b/src/json_test.c @@ -107,6 +107,12 @@ test_decode_find_end(void) reader.js_buf = (char_u *)" { "; assert(json_find_end(&reader, 0) == MAYBE); + /* JS object with white space */ + reader.js_buf = (char_u *)" { a : 123 } "; + assert(json_find_end(&reader, JSON_JS) == OK); + reader.js_buf = (char_u *)" { a : "; + assert(json_find_end(&reader, JSON_JS) == MAYBE); + /* array without white space */ reader.js_buf = (char_u *)"[\"a\",123]"; assert(json_find_end(&reader, 0) == OK); diff --git a/src/version.c b/src/version.c index 0e13125c79..a46b13ff39 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 216, +/**/ 215, /**/ 214, |