generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More through error checks in set_up

Browse Source 
Checks the return values of ssl_init_wbio_buffer() and ssl3_setup_buffers().
This commit is contained in:
Mike Bland 2014-05-01 10:08:18 -04:00 committed by Ben Laurie
parent f41231d62a
commit f5ad068b01
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ssl/heartbeat_test.c
View File

@ -68,6 +68,7 @@ static HEARTBEAT_TEST_FIXTURE set_up(const char* const test_case_name,
const SSL_METHOD* meth) const SSL_METHOD* meth)
{ {
HEARTBEAT_TEST_FIXTURE fixture; HEARTBEAT_TEST_FIXTURE fixture;
int setup_ok = 1;
memset(&fixture, 0, sizeof(fixture)); memset(&fixture, 0, sizeof(fixture));
fixture.test_case_name = test_case_name; fixture.test_case_name = test_case_name;
@ -75,7 +76,8 @@ static HEARTBEAT_TEST_FIXTURE set_up(const char* const test_case_name,
if (!fixture.ctx) if (!fixture.ctx)
{ {
fprintf(stderr, "Failed to allocate SSL_CTX for test: %s\n", fprintf(stderr, "Failed to allocate SSL_CTX for test: %s\n",
test_case_name); test_case_name);
setup_ok = 0;
goto fail; goto fail;
} }
@ -83,14 +85,28 @@ static HEARTBEAT_TEST_FIXTURE set_up(const char* const test_case_name,
if (!fixture.s) if (!fixture.s)
{ {
fprintf(stderr, "Failed to allocate SSL for test: %s\n", test_case_name); fprintf(stderr, "Failed to allocate SSL for test: %s\n", test_case_name);
setup_ok = 0;
goto fail; goto fail;
} }
ssl_init_wbio_buffer(fixture.s, 1); if (!ssl_init_wbio_buffer(fixture.s, 1))
ssl3_setup_buffers(fixture.s); {
fprintf(stderr, "Failed to set up wbio buffer for test: %s\n",
test_case_name);
setup_ok = 0;
goto fail;
}
if (!ssl3_setup_buffers(fixture.s))
{
fprintf(stderr, "Failed to setup buffers for test: %s\n",
test_case_name);
setup_ok = 0;
goto fail;
}
fail: fail:
if (!fixture.s) if (!setup_ok)
{ {
ERR_print_errors_fp(stderr); ERR_print_errors_fp(stderr);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);