From: Eliel C. Sardanons <eliels@gmail.com>
Date: Fri, 7 Nov 2008 02:37:47 +0000 (+0000)
Subject: Fix an asterisk crash if no asterisk.conf configuration file is present.
X-Git-Tag: 1.6.2.0-beta1~919
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65d4d1eb0fe56d10b1ea0c30983c65dccc5ce1ed;p=thirdparty%2Fasterisk.git

Fix an asterisk crash if no asterisk.conf configuration file is present.


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

diff --git a/main/pbx.c b/main/pbx.c
index 39d083f472..75134505bc 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -6548,6 +6548,7 @@ int ast_load_documentation(void)
 
 	if (!(cfg = ast_config_load2("asterisk.conf", "" /* core can't reload */, cnfflags))) {
 		ast_log(LOG_ERROR, "No asterisk.conf? That cannot be good.\n");
+		return 1;
 	}
 
 	for (var = ast_variable_browse(cfg, "options"); var; var = var->next) {