feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

BIO_new_mem_buf with negative len should take strlen of buf as len

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2020-05-20 16:53:05 +02:00
parent 4a85bf8108
commit 5f7832909b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ssl.c
View File

@@ -14913,7 +14913,7 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
{ {
WOLFSSL_BIO* bio = NULL; WOLFSSL_BIO* bio = NULL;
if (buf == NULL || len < 0) { if (buf == NULL) {
return bio; return bio;
} }
@@ -14922,6 +14922,9 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
return bio; return bio;
} }
if (len < 0) {
len = XSTRLEN(buf);
}
bio->num = bio->wrSz = len; bio->num = bio->wrSz = len;
bio->ptr = (byte*)XMALLOC(len, 0, DYNAMIC_TYPE_OPENSSL); bio->ptr = (byte*)XMALLOC(len, 0, DYNAMIC_TYPE_OPENSSL);
if (bio->ptr == NULL) { if (bio->ptr == NULL) {

3
tests/api.c
View File

@@ -24983,10 +24983,9 @@ static void test_wolfSSL_BIO_gets(void)
/* try with bad args */ /* try with bad args */
AssertNull(bio = BIO_new_mem_buf(NULL, sizeof(msg))); AssertNull(bio = BIO_new_mem_buf(NULL, sizeof(msg)));
AssertNull(bio = BIO_new_mem_buf((void*)msg, -1));
/* try with real msg */ /* try with real msg */
AssertNotNull(bio = BIO_new_mem_buf((void*)msg, sizeof(msg))); AssertNotNull(bio = BIO_new_mem_buf((void*)msg, -1));
XMEMSET(bio_buffer, 0, bufferSz); XMEMSET(bio_buffer, 0, bufferSz);
AssertNotNull(BIO_push(bio, BIO_new(BIO_s_bio()))); AssertNotNull(BIO_push(bio, BIO_new(BIO_s_bio())));
AssertNull(bio2 = BIO_find_type(bio, BIO_TYPE_FILE)); AssertNull(bio2 = BIO_find_type(bio, BIO_TYPE_FILE));