diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2021-08-25 14:30:12 +0200 |
|---|---|---|
| committer | Nicola Tuveri <nic.tuv@gmail.com> | 2021-08-27 14:54:08 +0300 |
| commit | e93a82da60f52e6fc799323b99499ee51e8c7215 (patch) | |
| tree | 231431163ea0fce7c9dbd15478a2f2423a3a78eb /crypto/bio | |
| parent | 58e1e397c6774be11b903c0f88e85bd2b8c4206f (diff) | |
Fix instances of pointer addition with the NULL pointer
ubsan found undefined pointer addtions in
crypto/bio/bss_mem.c (mem_ctrl),
crypto/pem/pem_lib.c (PEM_read_bio_ex),
test/testutil/format_output.c (test_fail_string_common,
test_fail_memory_common).
Mostly a straight back-port-of: a07dc81
Additionally enable the ubsan run-checker, to prevent regressions.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/16423)
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/bss_mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/bio/bss_mem.c b/crypto/bio/bss_mem.c index 7cb4a57813..14bfd00173 100644 --- a/crypto/bio/bss_mem.c +++ b/crypto/bio/bss_mem.c @@ -280,7 +280,7 @@ static long mem_ctrl(BIO *b, int cmd, long num, void *ptr) ret = (long)bm->length; if (ptr != NULL) { pptr = (char **)ptr; - *pptr = (char *)&(bm->data[0]); + *pptr = (char *)bm->data; } break; case BIO_C_SET_BUF_MEM: |