Do NOT attempt to do anything with the ast_config struct when it's been returned...

 (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 2055af396ec285c9ae4e57a9456daff2b60a5132..a382a7a809481fa4ed1dc6d4d7e91e9866dad53d 100644 (file)
--- 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 798a098bbe960d5356c2d7c9c1f6f5e55f233963..2899ec1a7164181292a8f2ec79607466053bf31f 100644 (file)
--- 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 */