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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273143 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/config.c b/main/config.c
index 7eb10bde435d6a5f8b0555fc0dad95ca1604e80b..5b8195a146827b24716fd5dc68b0281064f330d3 100644 (file)
--- 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;
        }