summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2025-05-18 06:38:11 +0000
committertb <>2025-05-18 06:38:11 +0000
commitaf1ef3c1489da1809c2ff641297daa2a8c023e75 (patch)
tree6045d7174fa0e9a166c1c735d51e861c6255998c /src
parent4eacd638866306c7a6d53f3fe66c2ce1f422e44a (diff)
downloadopenbsd-af1ef3c1489da1809c2ff641297daa2a8c023e75.tar.gz
openbsd-af1ef3c1489da1809c2ff641297daa2a8c023e75.tar.bz2
openbsd-af1ef3c1489da1809c2ff641297daa2a8c023e75.zip
bio_mem: avoid pointer arithmetic on NULL
Prompted by a diff by Kenjiro Nakayama ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/bio/bss_mem.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c
index 3e4c1e2e3f..472863be43 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.23 2025/05/10 05:54:38 tb Exp $ */ 1/* $OpenBSD: bss_mem.c,v 1.24 2025/05/18 06:38:11 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,7 +283,9 @@ 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 = bio_mem_read_ptr(bm); 286 *pptr = NULL;
287 if (bm->buf->max > 0)
288 *pptr = bio_mem_read_ptr(bm);
287 } 289 }
288 ret = (long)bio_mem_pending(bm); 290 ret = (long)bio_mem_pending(bm);
289 break; 291 break;