diff options
| author | Kurt Roeckx <kurt@roeckx.be> | 2015-01-24 14:46:50 +0100 |
|---|---|---|
| committer | Kurt Roeckx <kurt@roeckx.be> | 2015-01-24 14:52:58 +0100 |
| commit | 63c1d16bb85566fa3cdb13df321037a22f117957 (patch) | |
| tree | fa2d6709b34b3c8f1b03b97f67dd3302ee46197c /ssl/t1_lib.c | |
| parent | 6fa805f516f5a6ff3872f1d1014a3dc9de460b99 (diff) | |
Fix segfault with empty fields as last in the config.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/t1_lib.c')
| -rw-r--r-- | ssl/t1_lib.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 90ef867931..2c3a1ec4bc 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -651,6 +651,8 @@ static int nid_cb(const char *elem, int len, void *arg) size_t i; int nid; char etmp[20]; + if (elem == NULL) + return 0; if (narg->nidcnt == MAX_CURVELIST) return 0; if (len > (int)(sizeof(etmp) - 1)) @@ -3948,6 +3950,8 @@ static int sig_cb(const char *elem, int len, void *arg) size_t i; char etmp[20], *p; int sig_alg, hash_alg; + if (elem == NULL) + return 0; if (sarg->sigalgcnt == MAX_SIGALGLEN) return 0; if (len > (int)(sizeof(etmp) - 1)) |