diff options
author | tb <> | 2025-05-18 06:38:11 +0000 |
---|---|---|
committer | tb <> | 2025-05-18 06:38:11 +0000 |
commit | d4dc360a42471cfed8ba84f17e83c2bb95afd2bb (patch) | |
tree | 6045d7174fa0e9a166c1c735d51e861c6255998c | |
parent | 7a3ed913c13d7dab0583115759f6c241f90fba89 (diff) | |
download | openbsd-d4dc360a42471cfed8ba84f17e83c2bb95afd2bb.tar.gz openbsd-d4dc360a42471cfed8ba84f17e83c2bb95afd2bb.tar.bz2 openbsd-d4dc360a42471cfed8ba84f17e83c2bb95afd2bb.zip |
bio_mem: avoid pointer arithmetic on NULL
Prompted by a diff by Kenjiro Nakayama
ok jsing
-rw-r--r-- | src/lib/libcrypto/bio/bss_mem.c | 6 |
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; |