diff options
author | George Joseph <george.joseph@fairview5.com> | 2014-10-16 17:30:39 +0000 |
---|---|---|
committer | George Joseph <george.joseph@fairview5.com> | 2014-10-16 17:30:39 +0000 |
commit | b8f505294abfb69d8c416afa06e4764cf183ea17 (patch) | |
tree | 4519be276e015e456fedd6eb281df71623f53497 /main/config.c | |
parent | 289830cdc60bfe9da197810ef71f5116f56c8020 (diff) |
config: Fix inf loop using ast_category_browse and ast_variable_retrieve
Fix infinite loop when calling ast_variable_retrieve inside an
ast_category_browse loop when there is more than 1 category with
the same name.
Tested-by: George Joseph
Review: https://reviewboard.asterisk.org/r/4089/
........
Merged revisions 425713 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@425714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/config.c')
-rw-r--r-- | main/config.c | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/main/config.c b/main/config.c index 7e6a4d1c1..87000f3e3 100644 --- a/main/config.c +++ b/main/config.c @@ -677,10 +677,29 @@ const char *ast_config_option(struct ast_config *cfg, const char *cat, const cha return tmp; } -const char *ast_variable_retrieve(struct ast_config *config, - const char *category, const char *variable) +const char *ast_variable_retrieve(struct ast_config *config, const char *category, const char *variable) { - return ast_variable_retrieve_filtered(config, category, variable, NULL); + struct ast_variable *v; + + if (category) { + for (v = ast_variable_browse(config, category); v; v = v->next) { + if (!strcasecmp(variable, v->name)) { + return v->value; + } + } + } else { + struct ast_category *cat; + + for (cat = config->root; cat; cat = cat->next) { + for (v = cat->root; v; v = v->next) { + if (!strcasecmp(variable, v->name)) { + return v->value; + } + } + } + } + + return NULL; } const char *ast_variable_retrieve_filtered(struct ast_config *config, @@ -861,6 +880,12 @@ struct ast_category *ast_category_get(const struct ast_config *config, struct ast_category *cat; for (cat = config->root; cat; cat = cat->next) { + if (cat->name == category_name && does_category_match(cat, category_name, filter)) { + return cat; + } + } + + for (cat = config->root; cat; cat = cat->next) { if (does_category_match(cat, category_name, filter)) { return cat; } @@ -1188,7 +1213,6 @@ struct ast_category *ast_category_browse_filtered(struct ast_config *config, } cat = next_available_category(prev, category_name, filter); - config->last_browse = cat; return cat; } |