From 55ac522068e616d8a4d1bd5590f3b2d08d4ba25c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Fri, 1 Sep 2000 12:29:14 +0000 Subject: [PATCH 1/1] Undo change from 1.7 to 1.8: Returning -1 for an attempt to read from an empty buffer is empty is not an error that should be signalled via the error queue, it's a 'retry read' condition and is signalled as such. --- crypto/bio/bss_mem.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index d4d956c619..28ff7582bf 100644 --- a/crypto/bio/bss_mem.c +++ b/crypto/bio/bss_mem.c @@ -163,11 +163,9 @@ static int mem_read(BIO *b, char *out, int outl) } } else if (bm->length == 0) { - if (b->num != 0) + ret = b->num; + if (ret != 0) BIO_set_retry_read(b); - ret= b->num; - if(ret < 0) - BIOerr(BIO_F_MEM_READ,BIO_R_EOF_ON_MEMORY_BIO); } return(ret); } -- 2.34.1