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

config: Fix inf loop using ast_category_browse and ast_variable_retrieve

Browse Source 
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
This commit is contained in:
George Joseph
2014-10-16 17:30:39 +00:00
parent 289830cdc6
commit b8f505294a
3 changed files with 91 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/asterisk/config.h
View File

@@ -238,6 +238,11 @@ struct ast_category *ast_category_browse_filtered(struct ast_config *config,
*
* \retval a category name on success
* \retval NULL on failure/no-more-categories
*
* \note ast_category_browse maintains internal state. Therefore is not thread
* safe, cannot be called recursively, and it is not safe to add or remove
* categories while browsing.
* ast_category_browse_filtered does not have these restrictions.
*/
char *ast_category_browse(struct ast_config *config, const char *prev_name);
@@ -257,10 +262,6 @@ char *ast_category_browse(struct ast_config *config, const char *prev_name);
*
* \retval ast_variable list on success
* \retval NULL on failure
*
* \note ast_category_browse is not thread safe and it is not safe to call
* ast_category_delete while browsing using ast_category_browse.
* ast_category_browse_filtered does not have these restrictions.
*/
struct ast_variable *ast_variable_browse_filtered(const struct ast_config *config,
const char *category_name, const char *filter);