Commit 4f4d7f7

vwvwAlanscut

authored and

committed

CJSON_SetValuestring: better test for overlapping string

1 parent b47edc4 commit 4f4d7f7Copy full SHA for 4f4d7f7

File tree

+10

-6

lines changed

+10

-6

lines changed

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -473,15 +473,19 @@ static void cjson_functions_should_not_crash_with_null_pointers(void)`
`473`	`473`
`474`	`474`	`static void cjson_set_valuestring_should_return_null_if_strings_overlap(void)`
`475`	`475`	`{`
`476`		`- cJSON obj, obj_dup;`
	`476`	`+ cJSON *obj;`
`477`	`477`	`char* str;`
	`478`	`+ char* str2;`
`478`	`479`
`479`		`- obj = cJSON_Parse("\"fooz\"");`
`480`		`- obj_dup = cJSON_Duplicate(obj, 1);`
	`480`	`+ obj = cJSON_Parse("\"foo0z\"");`
`481`	`481`
`482`		`- str = cJSON_SetValuestring(obj_dup, "beeez");`
`483`		`- cJSON_SetValuestring(obj_dup, str);`
`484`		`- cJSON_SetValuestring(obj_dup, ++str);`
	`482`	`+ str = cJSON_SetValuestring(obj, "abcde");`
	`483`	`+ str += 1;`
	`484`	`+ /* The string passed to strcpy overlap which is not allowed.*/`
	`485`	`+ str2 = cJSON_SetValuestring(obj, str);`
	`486`	`+ /* If it overlaps, the string will be messed up.*/`
	`487`	`+ TEST_ASSERT_TRUE(strcmp(str, "bcde") == 0);`
	`488`	`+ TEST_ASSERT_NULL(str2);`
`485`	`489`	`}`
`486`	`490`
`487`	`491`	`static void CJSON_CDECL failing_realloc(void pointer, size_t size)`

Comments

(0)