From: Joshua Colp <jcolp@digium.com>
Date: Wed, 15 Jan 2014 16:36:09 +0000 (+0000)
Subject: cel_manager: Don't crash if configuration file is invalid.
X-Git-Tag: 12.1.0-rc1~3^2~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bbeb5831201f5e1dc46b5973c3dcdb0ad2e90ee;p=thirdparty%2Fasterisk.git

cel_manager: Don't crash if configuration file is invalid.

The cel_manager module did not properly handle the case where the
configuration file was invalid. The module will now output a warning
message and disable itself if this occurs.

Reported by: Bryan Walters
........

Merged revisions 405581 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 405582 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@405583 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/cel/cel_manager.c b/cel/cel_manager.c
index 2fc001fe11..610b6e4e05 100644
--- a/cel/cel_manager.c
+++ b/cel/cel_manager.c
@@ -153,7 +153,12 @@ static int load_config(int reload)
 		return 0;
 	}
 
-	if (!cfg) {
+	if (cfg == CONFIG_STATUS_FILEINVALID) {
+		ast_log(LOG_WARNING, "Configuration file '%s' is invalid. CEL manager Module not activated.\n",
+			CONF_FILE);
+		enablecel = 0;
+		return -1;
+	} else if (!cfg) {
 		ast_log(LOG_WARNING, "Failed to load configuration file. CEL manager Module not activated.\n");
 		enablecel = 0;
 		return -1;