summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_conf.c
diff options
context:
space:
mode:
authorKurt Roeckx <kurt@roeckx.be>2015-01-24 14:46:50 +0100
committerKurt Roeckx <kurt@roeckx.be>2015-01-24 14:46:50 +0100
commit2747d73c1466c487daf64a1234b6fe2e8a62ac75 (patch)
treef862e6a4a3ecdd9d53ec8d7a6814d7271504043b /ssl/ssl_conf.c
parentc963c421fb3d84ca3c86284593f0439f7c152f3e (diff)
Fix segfault with empty fields as last in the config.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'ssl/ssl_conf.c')
-rw-r--r--ssl/ssl_conf.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c
index af88a475b8..354f218cee 100644
--- a/ssl/ssl_conf.c
+++ b/ssl/ssl_conf.c
@@ -167,6 +167,8 @@ static int ssl_set_option_list(const char *elem, int len, void *usr)
* len == -1 indicates not being called in list context, just for single
* command line switches, so don't allow +, -.
*/
+ if (elem == NULL)
+ return 0;
if (len != -1) {
if (*elem == '+') {
elem++;