[svn-commits] sgriepentrog: trunk r418961 - in /trunk: ./ main/features_config.c

[SVN commits to the Digium repositories]

Author: sgriepentrog
Date: Fri Jul 18 12:40:54 2014
New Revision: 418961

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418961
Log:
feature_config: insure featuregroups and applicationmaps are initialized

If the features.conf is missing, the cfg->featurgroups
and cfg->applicationmaps is not initialized, resulting
in assert on ao2_find of a null container.  This patch
changes the initialization call and adds asserts for a
safeguard.

Review: https://reviewboard.asterisk.org/r/3809/
........

Merged revisions 418886 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/main/features_config.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/main/features_config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features_config.c?view=diff&rev=418961&r1=418960&r2=418961
==============================================================================
--- trunk/main/features_config.c (original)
+++ trunk/main/features_config.c Fri Jul 18 12:40:54 2014
@@ -799,6 +799,7 @@
 
 	/* applicationmap and featuregroups are purposely not copied. A channel's applicationmap
 	 * is produced on the fly when ast_get_chan_applicationmap() is called
+	 * NOTE: This does not apply to the global cfg->applicationmap and cfg->featuresgroups
 	 */
 }
 
@@ -1290,6 +1291,9 @@
 		return NULL;
 	}
 
+	/* global config must be initialized */
+	ast_assert(cfg->featuregroups != NULL);
+	ast_assert(cfg->applicationmap != NULL);
 	while ((name = strsep(&group_names, "#"))) {
 		RAII_VAR(struct featuregroup *, group, ao2_find(cfg->featuregroups, name, OBJ_KEY), ao2_cleanup);
 
@@ -1531,6 +1535,9 @@
 	 * items refer to actual applicationmap items.
 	 */
 
+	/* global config must be initialized */
+	ast_assert(cfg->featuregroups != NULL);
+	ast_assert(cfg->applicationmap != NULL);
 	ao2_callback_data(cfg->featuregroups, 0, check_featuregroup, &err, cfg->applicationmap);
 
 	return err;
@@ -1790,7 +1797,7 @@
 			"", unsupported_handler, 0);
 
 	if (aco_process_config(&cfg_info, 0) == ACO_PROCESS_ERROR) {
-		RAII_VAR(struct features_config *, features_cfg, __features_config_alloc(0), ao2_cleanup);
+		RAII_VAR(struct features_config *, features_cfg, features_config_alloc(), ao2_cleanup);
 
 		if (aco_set_defaults(&global_option, "general", features_cfg->global) ||
 			aco_set_defaults(&featuremap_option, "featuremap", features_cfg->featuremap)) {