projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f48ad5c
)
Fix crash
author
Rich Salz
<rsalz@openssl.org>
Thu, 15 Jun 2017 22:51:10 +0000
(18:51 -0400)
committer
Rich Salz
<rsalz@openssl.org>
Wed, 5 Jul 2017 21:06:57 +0000
(17:06 -0400)
[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)
crypto/err/err.c
patch
|
blob
|
history
diff --git
a/crypto/err/err.c
b/crypto/err/err.c
index 906e3543e16b878f0638c2b8bfda7d3508689666..e50c6d6f9d4e17ffdcfc21ea1efbe4706020c726 100644
(file)
--- 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;