forked from aniani/vim
patch 8.1.1158: json encoded string is sometimes missing the final NUL
Problem: Json encoded string is sometimes missing the final NUL. Solution: Add the NUL. Also for log messages.
This commit is contained in:
@@ -5877,6 +5877,7 @@ job_start(
|
|||||||
ga_concat(&ga, (char_u *)" ");
|
ga_concat(&ga, (char_u *)" ");
|
||||||
ga_concat(&ga, (char_u *)argv[i]);
|
ga_concat(&ga, (char_u *)argv[i]);
|
||||||
}
|
}
|
||||||
|
ga_append(&ga, NUL);
|
||||||
ch_log(NULL, "Starting job: %s", (char *)ga.ga_data);
|
ch_log(NULL, "Starting job: %s", (char *)ga.ga_data);
|
||||||
ga_clear(&ga);
|
ga_clear(&ga);
|
||||||
}
|
}
|
||||||
|
@@ -51,6 +51,7 @@ json_encode(typval_T *val, int options)
|
|||||||
/* Store bytes in the growarray. */
|
/* Store bytes in the growarray. */
|
||||||
ga_init2(&ga, 1, 4000);
|
ga_init2(&ga, 1, 4000);
|
||||||
json_encode_gap(&ga, val, options);
|
json_encode_gap(&ga, val, options);
|
||||||
|
ga_append(&ga, NUL);
|
||||||
return ga.ga_data;
|
return ga.ga_data;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,6 +83,7 @@ json_encode_nr_expr(int nr, typval_T *val, int options)
|
|||||||
if (json_encode_gap(&ga, &listtv, options) == OK && (options & JSON_NL))
|
if (json_encode_gap(&ga, &listtv, options) == OK && (options & JSON_NL))
|
||||||
ga_append(&ga, '\n');
|
ga_append(&ga, '\n');
|
||||||
list_unref(listtv.vval.v_list);
|
list_unref(listtv.vval.v_list);
|
||||||
|
ga_append(&ga, NUL);
|
||||||
return ga.ga_data;
|
return ga.ga_data;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@@ -289,3 +289,10 @@ func Test_js_decode()
|
|||||||
|
|
||||||
call assert_equal(s:varl5, js_decode(s:jsl5))
|
call assert_equal(s:varl5, js_decode(s:jsl5))
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_json_encode_long()
|
||||||
|
" The growarray uses a grow size of 4000, check that a result that is exactly
|
||||||
|
" 4000 bytes long is not missing the final NUL.
|
||||||
|
let json = json_encode([repeat('a', 3996)])
|
||||||
|
call assert_equal(4000, len(json))
|
||||||
|
endfunc
|
||||||
|
@@ -771,6 +771,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1158,
|
||||||
/**/
|
/**/
|
||||||
1157,
|
1157,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user