From 74accb17cde1b88794b2b764cabaaf1f0858656c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 15 May 2020 20:38:40 +0200 Subject: Fix CVE-2020-12762. This commit is a squashed and slightly modified backport of the following commits on the master branch: * 77d935b * d07b910 * 519dfe1 * a59d5ac --- tests/test4.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'tests/test4.c') diff --git a/tests/test4.c b/tests/test4.c index 23e97da..8b05848 100644 --- a/tests/test4.c +++ b/tests/test4.c @@ -2,9 +2,11 @@ * gcc -o utf8 utf8.c -I/home/y/include -L./.libs -ljson */ +#include "config.h" +#include #include +#include #include -#include "config.h" #include "json_inttypes.h" #include "json_object.h" @@ -24,6 +26,30 @@ void print_hex( const char* s) printf("\n"); } +static void test_lot_of_adds(void); +static void test_lot_of_adds() +{ + int ii; + char key[50]; + json_object *jobj = json_object_new_object(); + assert(jobj != NULL); + for (ii = 0; ii < 500; ii++) + { + snprintf(key, sizeof(key), "k%d", ii); + json_object *iobj = json_object_new_int(ii); + assert(iobj != NULL); + json_object_object_add(jobj, key, iobj); + if (json_object_object_get_ex(jobj, key, &iobj) == FALSE) + { + fprintf(stderr, "FAILED to add object #%d\n", ii); + abort(); + } + } + printf("%s\n", json_object_to_json_string(jobj)); + assert(json_object_object_length(jobj) == 500); + json_object_put(jobj); +} + int main() { const char *input = "\"\\ud840\\udd26,\\ud840\\udd27,\\ud800\\udd26,\\ud800\\udd27\""; @@ -49,5 +75,8 @@ int main() retval = 1; } json_object_put(parse_result); + + test_lot_of_adds(); + return retval; } -- cgit v1.2.1