diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-06-16 00:51:10 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-07-05 23:06:57 +0200 |
| commit | e2dba64c8460a3c08cd6021184b5a8163df28306 (patch) | |
| tree | 61e81a5b029be376bb2bd337f5497ea49c4af356 /crypto | |
| parent | Undo commit dc00fb9 (diff) | |
| download | openssl-e2dba64c8460a3c08cd6021184b5a8163df28306.tar.xz openssl-e2dba64c8460a3c08cd6021184b5a8163df28306.zip | |
Fix crash
[extended tests]
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3700)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/err/err.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index 906e3543e1..e50c6d6f9d 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -757,6 +757,8 @@ void ERR_add_error_vdata(int num, va_list args) n = 0; for (i = 0; i < num; i++) { a = va_arg(args, char *); + if (a == NULL) + a = "<NULL>"; n += strlen(a); if (n > s) { s = n + 20; |