From: Bodo Möller <bodo@openssl.org>
Date: Fri, 1 Sep 2000 12:29:14 +0000 (+0000)
Subject: Undo change from 1.7 to 1.8:
X-Git-Tag: OpenSSL-engine-0_9_6-beta1~12^2~37
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=55ac522068e616d8a4d1bd5590f3b2d08d4ba25c;hp=ccc265eaa7a0af0e52aab6961ac3ddd9e5a22156

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.
---

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);
 	}