From ff9d397e7e76ff6cf62ce357ec25a615036b5c55 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sat, 24 May 2025 19:43:09 +0000
Subject: Revert "bio_mem: avoid pointer arithmetic on NULL"

This causes a test failure in pyca/cryptography.
---
 src/lib/libcrypto/bio/bss_mem.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c
index 472863be43..0936ab4e83 100644
--- a/src/lib/libcrypto/bio/bss_mem.c
+++ b/src/lib/libcrypto/bio/bss_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bss_mem.c,v 1.24 2025/05/18 06:38:11 tb Exp $ */
+/* $OpenBSD: bss_mem.c,v 1.25 2025/05/24 19:43:09 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -283,9 +283,7 @@ mem_ctrl(BIO *bio, int cmd, long num, void *ptr)
 	case BIO_CTRL_INFO:
 		if (ptr != NULL) {
 			pptr = (void **)ptr;
-			*pptr = NULL;
-			if (bm->buf->max > 0)
-				*pptr = bio_mem_read_ptr(bm);
+			*pptr = bio_mem_read_ptr(bm);
 		}
 		ret = (long)bio_mem_pending(bm);
 		break;
-- 
cgit v1.2.3-55-g6feb