From: BJ Weschke <bweschke@btwtech.com>
Date: Mon, 20 Oct 2008 05:07:25 +0000 (+0000)
Subject:  Do NOT attempt to do anything with the ast_config struct when it's been returned... 
X-Git-Tag: 1.6.2.0-beta1~1053
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9aefadd7c18457b8ac5d6d7d8c75e0b5264cbe4e;p=thirdparty%2Fasterisk.git

 Do NOT attempt to do anything with the ast_config struct when it's been returned as INVALID by the config file interpreter.

 (closes issue #13741)



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

diff --git a/main/config.c b/main/config.c
index 2055af396e..a382a7a809 100644
--- a/main/config.c
+++ b/main/config.c
@@ -2050,9 +2050,9 @@ struct ast_config *ast_config_internal_load(const char *filename, struct ast_con
 
 	result = loader->load_func(db, table, filename, cfg, flags, suggested_include_file, who_asked);
 
-	if (result && result != CONFIG_STATUS_FILEUNCHANGED)
+	if (result && result != CONFIG_STATUS_FILEINVALID && result != CONFIG_STATUS_FILEUNCHANGED)
 		result->include_level--;
-	else
+	else if (result != CONFIG_STATUS_FILEINVALID)
 		cfg->include_level--;
 
 	return result;
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 798a098bbe..2899ec1a71 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1412,7 +1412,7 @@ static int pbx_load_config(const char *config_file)
 	struct ast_flags config_flags = { 0 };
 	char lastextension[256];
 	cfg = ast_config_load(config_file, config_flags);
-	if (!cfg)
+	if (!cfg || cfg == CONFIG_STATUS_FILEINVALID)
 		return 0;
 
 	/* Use existing config to populate the PBX table */