summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2025-05-24 19:43:09 +0000
committertb <>2025-05-24 19:43:09 +0000
commitff9d397e7e76ff6cf62ce357ec25a615036b5c55 (patch)
tree69b2fa3b3f209fd3cf1832cc479e9d87da36c83b
parent0aeb160e256978dc720ca25420c6ed1763539c53 (diff)
downloadopenbsd-ff9d397e7e76ff6cf62ce357ec25a615036b5c55.tar.gz
openbsd-ff9d397e7e76ff6cf62ce357ec25a615036b5c55.tar.bz2
openbsd-ff9d397e7e76ff6cf62ce357ec25a615036b5c55.zip
Revert "bio_mem: avoid pointer arithmetic on NULL"
This causes a test failure in pyca/cryptography.
-rw-r--r--src/lib/libcrypto/bio/bss_mem.c6
1 files changed, 2 insertions, 4 deletions
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 @@
1/* $OpenBSD: bss_mem.c,v 1.24 2025/05/18 06:38:11 tb Exp $ */ 1/* $OpenBSD: bss_mem.c,v 1.25 2025/05/24 19:43:09 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -283,9 +283,7 @@ mem_ctrl(BIO *bio, int cmd, long num, void *ptr)
283 case BIO_CTRL_INFO: 283 case BIO_CTRL_INFO:
284 if (ptr != NULL) { 284 if (ptr != NULL) {
285 pptr = (void **)ptr; 285 pptr = (void **)ptr;
286 *pptr = NULL; 286 *pptr = bio_mem_read_ptr(bm);
287 if (bm->buf->max > 0)
288 *pptr = bio_mem_read_ptr(bm);
289 } 287 }
290 ret = (long)bio_mem_pending(bm); 288 ret = (long)bio_mem_pending(bm);
291 break; 289 break;