[svn-commits] tilghman: branch 1.6.2 r273143 - in /branches/1.6.2: ./ main/config.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Jun 29 20:02:41 2010
New Revision: 273143

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273143
Log:
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
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/config.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/config.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/config.c?view=diff&rev=273143&r1=273142&r2=273143
==============================================================================
--- branches/1.6.2/main/config.c (original)
+++ branches/1.6.2/main/config.c Tue Jun 29 20:02:41 2010
@@ -1883,7 +1883,9 @@
 	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;
 	}