summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorBJ Weschke <bweschke@btwtech.com>2008-10-20 05:07:25 +0000
committerBJ Weschke <bweschke@btwtech.com>2008-10-20 05:07:25 +0000
commit9aefadd7c18457b8ac5d6d7d8c75e0b5264cbe4e (patch)
tree5d8a1c01a4b110421fba82e690232989787995ab /main
parent21592959cfa070215aabc1e7860b2bb726c2ac97 (diff)
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
Diffstat (limited to 'main')
-rw-r--r--main/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/config.c b/main/config.c
index 2055af396..a382a7a80 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;