From c9dc22bc3d7f2df670dff66f04935e540e1b931a Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Fri, 1 Mar 2019 01:55:38 +0100 Subject: Add test for the BIO_get_mem_ptr() regression Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/8649) --- test/bio_memleak_test.c | 41 +++++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/test/bio_memleak_test.c b/test/bio_memleak_test.c index 36680e30a8..c11455fc60 100644 --- a/test/bio_memleak_test.c +++ b/test/bio_memleak_test.c @@ -18,25 +18,53 @@ static int test_bio_memleak(void) int ok = 0; BIO *bio; BUF_MEM bufmem; - const char *str = "BIO test\n"; + static const char str[] = "BIO test\n"; char buf[100]; bio = BIO_new(BIO_s_mem()); - if (bio == NULL) + if (!TEST_ptr(bio)) goto finish; - bufmem.length = strlen(str) + 1; + bufmem.length = sizeof(str); bufmem.data = (char *) str; bufmem.max = bufmem.length; BIO_set_mem_buf(bio, &bufmem, BIO_NOCLOSE); BIO_set_flags(bio, BIO_FLAGS_MEM_RDONLY); + if (!TEST_int_eq(BIO_read(bio, buf, sizeof(buf)), sizeof(str))) + goto finish; + if (!TEST_mem_eq(buf, sizeof(str), str, sizeof(str))) + goto finish; + ok = 1; + +finish: + BIO_free(bio); + return ok; +} - if (BIO_read(bio, buf, sizeof(buf)) <= 0) - goto finish; +static int test_bio_get_mem(void) +{ + int ok = 0; + BIO *bio = NULL; + BUF_MEM *bufmem = NULL; - ok = strcmp(buf, str) == 0; + bio = BIO_new(BIO_s_mem()); + if (!TEST_ptr(bio)) + goto finish; + if (!TEST_int_eq(BIO_puts(bio, "Hello World\n"), 12)) + goto finish; + BIO_get_mem_ptr(bio, &bufmem); + if (!TEST_ptr(bufmem)) + goto finish; + if (!TEST_int_gt(BIO_set_close(bio, BIO_NOCLOSE), 0)) + goto finish; + BIO_free(bio); + bio = NULL; + if (!TEST_mem_eq(bufmem->data, bufmem->length, "Hello World\n", 12)) + goto finish; + ok = 1; finish: BIO_free(bio); + BUF_MEM_free(bufmem); return ok; } @@ -50,5 +78,6 @@ int global_init(void) int setup_tests(void) { ADD_TEST(test_bio_memleak); + ADD_TEST(test_bio_get_mem); return 1; } -- cgit v1.2.3