mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-04-06 20:20:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid NULL+X UB in bss_mem.c

Browse Source 
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)
This commit is contained in:
jwalch 2021-10-15 19:03:17 -04:00 committed by Tomas Mraz
parent 5fdc95e443
commit a98b26588b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/bio/bss_mem.c
View File

@ -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;