collabvm/r3
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix leak in r3_tree_insert_pathl_ex() (#150)

Browse source 
Includes a testcase triggering the issue when building with
the leak sanitizer.

Resource leak (CID 355063) found by Coverity,
This commit is contained in:
Bjorn Svensson 2022-07-20 13:23:45 +02:00 committed by GitHub
parent 25cc816025
commit 9b69f38527
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/node.c
View file

@ -701,8 +701,12 @@ R3Node * r3_tree_insert_pathl_ex(R3Node *tree, const char *path, unsigned int pa
char *err = NULL; char *err = NULL;
e = r3_node_find_common_prefix(tree, path, path_len, &prefix_len, &err); e = r3_node_find_common_prefix(tree, path, path_len, &prefix_len, &err);
if (err) { if (err) {
// copy the error message pointer if (errstr) {
if (errstr) *errstr = err; // copy the error message pointer
*errstr = err;
} else {
free(err);
}
return NULL; return NULL;
} }

18
tests/check_tree.c
View file

@ -595,8 +595,25 @@ START_TEST (test_insert_pathl_fail)
} }
END_TEST END_TEST
START_TEST (test_insert_pathl_fail2)
{
R3Node * n = r3_tree_create(10);
char *errstr = NULL;
R3Node * ret;
ret = r3_tree_insert_pathl_ex(n, "/foo", strlen("/foo"), 0, 0, 0, NULL);
ck_assert(ret);
/* Insert an incomplete pattern without requesting an error string */
ret = r3_tree_insert_pathl_ex(n, "/foo/{name:\\d{5}", strlen("/foo/{name:\\d{5}"), 0, 0, 0, NULL);
ck_assert(ret == NULL);
r3_tree_compile(n, &errstr);
ck_assert(errstr == NULL);
r3_tree_free(n);
}
END_TEST
START_TEST (test_insert_pathl) START_TEST (test_insert_pathl)
{ {
@ -862,6 +879,7 @@ Suite* r3_suite (void) {
tcase = tcase_create("insert_testcase"); tcase = tcase_create("insert_testcase");
tcase_add_test(tcase, test_insert_pathl); tcase_add_test(tcase, test_insert_pathl);
tcase_add_test(tcase, test_insert_pathl_fail); tcase_add_test(tcase, test_insert_pathl_fail);
tcase_add_test(tcase, test_insert_pathl_fail2);
tcase_add_test(tcase, test_node_construct_and_free); tcase_add_test(tcase, test_node_construct_and_free);
suite_add_tcase(suite, tcase); suite_add_tcase(suite, tcase);