diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-30 01:02:41 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-30 01:02:41 +0000 |
| commit | 5cc20ab54811500406e599d16fd4df0b8bf482c9 (patch) | |
| tree | 5e4cbc8b776ca6ffdf71e7847298ab8504415fdd | |
| parent | a217b640c6d23dda80409c194077bc6caf4eb88b (diff) | |
Merged revisions 273142 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r273142 | tilghman | 2010-06-29 20:01:14 -0500 (Tue, 29 Jun 2010) | 5 lines
Don't attempt to proceed if our internal parser indicates an invalid file.
(closes issue #17560)
Reported by: Nick_Lewis
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273143 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/config.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/config.c b/main/config.c index 7eb10bde4..5b8195a14 100644 --- a/main/config.c +++ b/main/config.c @@ -1883,7 +1883,9 @@ int read_config_maps(void) configtmp = ast_config_new(); configtmp->max_include_level = 1; config = ast_config_internal_load(extconfig_conf, configtmp, flags, "", "extconfig"); - if (!config) { + if (config == CONFIG_STATUS_FILEINVALID) { + return -1; + } else if (!config) { ast_config_destroy(configtmp); return 0; } |