nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix leak-on-test-failure in test_routerkeys.c

Browse Source 
CID 1301379
This commit is contained in:
Nick Mathewson 2015-05-28 13:06:30 -04:00
parent 0585d4e94b
commit 3262f3c3f6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/test/test_routerkeys.c
View File

@ -86,7 +86,7 @@ test_routerkeys_ed_certs(void *args)
{ {
(void)args; (void)args;
ed25519_keypair_t kp1, kp2; ed25519_keypair_t kp1, kp2;
tor_cert_t *cert[2] = {NULL, NULL}; tor_cert_t *cert[2] = {NULL, NULL}, *nocert = NULL;
tor_cert_t *parsed_cert[2] = {NULL, NULL}; tor_cert_t *parsed_cert[2] = {NULL, NULL};
time_t now = 1412094534; time_t now = 1412094534;
uint8_t *junk = NULL; uint8_t *junk = NULL;
@ -156,17 +156,20 @@ test_routerkeys_ed_certs(void *args)
/* Now try some junky certs. */ /* Now try some junky certs. */
/* - Truncated */ /* - Truncated */
tt_ptr_op(NULL, ==,tor_cert_parse(cert[0]->encoded, cert[0]->encoded_len-1)); nocert = tor_cert_parse(cert[0]->encoded, cert[0]->encoded_len-1);
tt_ptr_op(NULL, ==, nocert);
/* - First byte modified */ /* - First byte modified */
cert[0]->encoded[0] = 99; cert[0]->encoded[0] = 99;
tt_ptr_op(NULL, ==,tor_cert_parse(cert[0]->encoded, cert[0]->encoded_len)); nocert = tor_cert_parse(cert[0]->encoded, cert[0]->encoded_len);
tt_ptr_op(NULL, ==, nocert);
cert[0]->encoded[0] = 1; cert[0]->encoded[0] = 1;
/* - Extra byte at the end*/ /* - Extra byte at the end*/
junk = tor_malloc_zero(cert[0]->encoded_len + 1); junk = tor_malloc_zero(cert[0]->encoded_len + 1);
memcpy(junk, cert[0]->encoded, cert[0]->encoded_len); memcpy(junk, cert[0]->encoded, cert[0]->encoded_len);
tt_ptr_op(NULL, ==, tor_cert_parse(junk, cert[0]->encoded_len+1)); nocert = tor_cert_parse(junk, cert[0]->encoded_len+1);
tt_ptr_op(NULL, ==, nocert);
/* - Multiple signing key instances */ /* - Multiple signing key instances */
tor_free(junk); tor_free(junk);
@ -179,13 +182,15 @@ test_routerkeys_ed_certs(void *args)
junk[42] = 4; /* exttype */ junk[42] = 4; /* exttype */
junk[77] = 32; /* extlen */ junk[77] = 32; /* extlen */
junk[78] = 4; /* exttype */ junk[78] = 4; /* exttype */
tt_ptr_op(NULL, ==, tor_cert_parse(junk, 104 + 36 * 2)); nocert = tor_cert_parse(junk, 104 + 36 * 2);
tt_ptr_op(NULL, ==, nocert);
done: done:
tor_cert_free(cert[0]); tor_cert_free(cert[0]);
tor_cert_free(cert[1]); tor_cert_free(cert[1]);
tor_cert_free(parsed_cert[0]); tor_cert_free(parsed_cert[0]);
tor_cert_free(parsed_cert[1]); tor_cert_free(parsed_cert[1]);
tor_cert_free(nocert);
tor_free(junk); tor_free(junk);
tor_free(base64); tor_free(base64);
} }