summaryrefslogtreecommitdiffstats
path: root/crypto/pem
diff options
context:
space:
mode:
authorvaldaarhun <icegambit91@gmail.com>2022-07-25 18:49:19 +0530
committerPauli <pauli@openssl.org>2022-07-29 12:39:02 +1000
commit205957405d08ef199e6ab654e333a627bbca9ccc (patch)
treed1ed5fd58dc422983a15a7048f0cfc56d28f4f6c /crypto/pem
parentdf274c334c523f7375d5aa60ff4b9a846c3e2a6c (diff)
Fixes segfault occurrence in PEM_write()
Checks if header is NULL or not before calling strlen(). CLA: trivial Fixes #18825 Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Ben Kaduk <kaduk@mit.edu> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/18865)
Diffstat (limited to 'crypto/pem')
-rw-r--r--crypto/pem/pem_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c
index 544d6c51b7..98050f8348 100644
--- a/crypto/pem/pem_lib.c
+++ b/crypto/pem/pem_lib.c
@@ -624,7 +624,7 @@ int PEM_write_bio(BIO *bp, const char *name, const char *header,
(BIO_write(bp, "-----\n", 6) != 6))
goto err;
- i = strlen(header);
+ i = header != NULL ? strlen(header) : 0;
if (i > 0) {
if ((BIO_write(bp, header, i) != i) || (BIO_write(bp, "\n", 1) != 1))
goto err;