From: Rob Percival <robpercival@google.com>
Date: Thu, 3 Mar 2016 16:08:01 +0000 (+0000)
Subject: Handle missing "enabled_logs" line in CT log file
X-Git-Tag: OpenSSL_1_1_0-pre4~363
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0c6ea56568f8dbc5d83cd737d81cd7362295acf0;p=oweals%2Fopenssl.git

Handle missing "enabled_logs" line in CT log file

Reviewed-by: Ben Laurie <ben@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/crypto/ct/ct_log.c b/crypto/ct/ct_log.c
index f5a01fdbd3..1a98c7a0bd 100644
--- a/crypto/ct/ct_log.c
+++ b/crypto/ct/ct_log.c
@@ -245,6 +245,12 @@ int CTLOG_STORE_load_file(CTLOG_STORE *store, const char *file)
     }
 
     enabled_logs = NCONF_get_string(load_ctx->conf, NULL, "enabled_logs");
+    if (enabled_logs == NULL) {
+        ret = 0;
+        CTerr(CT_F_CTLOG_STORE_LOAD_FILE, CT_R_LOG_CONF_INVALID);
+        goto end;
+    }
+
     ret = CONF_parse_list(enabled_logs, ',', 1, ctlog_store_load_log, load_ctx);
     if (ret == 1 && load_ctx->invalid_log_entries > 0) {
         ret = 0;