kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

sorcery: Eliminate shadowing a varaible that caused confusion.

Browse Source 
* Eliminated shadowing of the __ast_sorcery_apply_config() name parameter
causing confusion.

* Fix potential crash from sorcery.conf user input in
__ast_sorcery_apply_config() if the user supplied a malformed config line
that is missing the sorcery object type name.

* Remove redundant test in __ast_sorcery_apply_config().  !config and
config == CONFIGS_STATUS_FILEMISSING are identical.
........

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403544 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-12-09 18:32:57 +00:00
parent dcb642e2da
commit 0a02932ddf
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/sorcery.c
View File

@@ -513,19 +513,21 @@ int __ast_sorcery_apply_config(struct ast_sorcery *sorcery, const char *name, co
struct ast_variable *mapping; struct ast_variable *mapping;
int res = 0; int res = 0;
if (!config || (config == CONFIG_STATUS_FILEMISSING) || (config == CONFIG_STATUS_FILEINVALID)) { if (!config || config == CONFIG_STATUS_FILEINVALID) {
return -1; return -1;
} }
for (mapping = ast_variable_browse(config, name); mapping; mapping = mapping->next) { for (mapping = ast_variable_browse(config, name); mapping; mapping = mapping->next) {
RAII_VAR(char *, mapping_name, ast_strdup(mapping->name), ast_free); RAII_VAR(char *, mapping_name, ast_strdup(mapping->name), ast_free);
RAII_VAR(char *, mapping_value, ast_strdup(mapping->value), ast_free); RAII_VAR(char *, mapping_value, ast_strdup(mapping->value), ast_free);
char *options = mapping_name, *name = strsep(&options, "/"); char *options = mapping_name;
char *data = mapping_value, *wizard = strsep(&data, ","); char *type = strsep(&options, "/");
char *data = mapping_value;
char *wizard = strsep(&data, ",");
unsigned int caching = 0; unsigned int caching = 0;
/* If no wizard exists just skip, nothing we can do */ /* If no object type or wizard exists just skip, nothing we can do */
if (ast_strlen_zero(wizard)) { if (ast_strlen_zero(type) || ast_strlen_zero(wizard)) {
continue; continue;
} }
@@ -535,7 +537,8 @@ int __ast_sorcery_apply_config(struct ast_sorcery *sorcery, const char *name, co
} }
/* Any error immediately causes us to stop */ /* Any error immediately causes us to stop */
if ((res = sorcery_apply_wizard_mapping(sorcery, name, module, wizard, data, caching))) { if (sorcery_apply_wizard_mapping(sorcery, type, module, wizard, data, caching)) {
res = -1;
break; break;
} }
} }