From c6991655c4ce4764861dd5bdf64a92be5f54dbb3 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 18 Jun 2019 16:41:48 +0200 Subject: Fix and document BIO_FLAGS_NONCLEAR_RST behavior on memory BIO The BIO_FLAGS_NONCLEAR_RST flag behavior was not properly documented and it also caused the length to be incorrectly set after the reset operation. Reviewed-by: Bernd Edlinger Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/9179) (cherry picked from commit 8b7b32921e63c492fa7233d81b11ee4d7ba266de) --- crypto/bio/bss_mem.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'crypto/bio') diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index 8c621d6c1e..2d536e9db0 100644 --- a/crypto/bio/bss_mem.c +++ b/crypto/bio/bss_mem.c @@ -259,9 +259,7 @@ static long mem_ctrl(BIO *b, int cmd, long num, void *ptr) bm = bbm->buf; if (bm->data != NULL) { if (!(b->flags & BIO_FLAGS_MEM_RDONLY)) { - if (b->flags & BIO_FLAGS_NONCLEAR_RST) { - bm->length = bm->max; - } else { + if (!(b->flags & BIO_FLAGS_NONCLEAR_RST)) { memset(bm->data, 0, bm->max); bm->length = 0; } -- cgit v1.2.3