diff options
| author | jwalch <jeremy.walch@gmail.com> | 2021-10-15 19:03:17 -0400 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-10-19 12:16:35 +0200 |
| commit | 0c34ce7c99d6113dec7652bceafe6d7744edf2cf (patch) | |
| tree | 09020a217050b8967f6e34bd1775c4cc88623056 /crypto/bio | |
| parent | 2f98fd4b04bcb25fd7134c39ea4930c57615d4ea (diff) | |
Avoid NULL+X UB in bss_mem.c
Fixes #16816
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16818)
(cherry picked from commit a98b26588b683eb024ab81f3bb3549c43acd5188)
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/bss_mem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index 7e501762bb..9153c1f1cd 100644 --- a/crypto/bio/bss_mem.c +++ b/crypto/bio/bss_mem.c @@ -254,7 +254,7 @@ static long mem_ctrl(BIO *b, int cmd, long num, void *ptr) bm = bbm->readp; bo = bbm->buf; } - off = bm->data - bo->data; + off = (bm->data == bo->data) ? 0 : bm->data - bo->data; remain = bm->length; switch (cmd) { @@ -277,7 +277,7 @@ static long mem_ctrl(BIO *b, int cmd, long num, void *ptr) if (num < 0 || num > off + remain) return -1; /* Can't see outside of the current buffer */ - bm->data = bo->data + num; + bm->data = (num != 0) ? bo->data + num : bo->data; bm->length = bo->length - num; bm->max = bo->max - num; off = num; |