diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-12-09 18:50:20 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-12-09 18:50:20 +0000 |
| commit | 31d51d373bb52e06fca781287eff2ad2063abbaa (patch) | |
| tree | 496bbb02d66f0fe071e593dea9427fae9ea7e833 | |
| parent | 0a02932ddf96458212487670b58ac69a593b607a (diff) | |
res_sorcery_astdb.c: Fix get multiple records by regex.
* Fix sorcery_astdb_retrieve_regex() pattern matching. Let the regexec()
function match the stored key values instead of having astdb prefilter
them. Previoiusly you could only use a simple regex pattern when the
pattern began with '^'.
* Fix off nominal memory leak in sorcery_astdb_retrieve_regex().
........
Merged revisions 403545 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403546 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | res/res_sorcery_astdb.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/res/res_sorcery_astdb.c b/res/res_sorcery_astdb.c index ecea885d0..61a607ffd 100644 --- a/res/res_sorcery_astdb.c +++ b/res/res_sorcery_astdb.c @@ -218,20 +218,14 @@ static void sorcery_astdb_retrieve_multiple(const struct ast_sorcery *sorcery, v static void sorcery_astdb_retrieve_regex(const struct ast_sorcery *sorcery, void *data, const char *type, struct ao2_container *objects, const char *regex) { const char *prefix = data; - char family[strlen(prefix) + strlen(type) + 2], tree[strlen(regex) + 1]; + char family[strlen(prefix) + strlen(type) + 2]; RAII_VAR(struct ast_db_entry *, entries, NULL, ast_db_freetree); regex_t expression; struct ast_db_entry *entry; snprintf(family, sizeof(family), "%s/%s", prefix, type); - if (regex[0] == '^') { - snprintf(tree, sizeof(tree), "%s%%", regex + 1); - } else { - tree[0] = '\0'; - } - - if (!(entries = ast_db_gettree(family, tree)) || regcomp(&expression, regex, REG_EXTENDED | REG_NOSUB)) { + if (!(entries = ast_db_gettree(family, NULL)) || regcomp(&expression, regex, REG_EXTENDED | REG_NOSUB)) { return; } @@ -249,6 +243,7 @@ static void sorcery_astdb_retrieve_regex(const struct ast_sorcery *sorcery, void !(objset = sorcery_json_to_objectset(json)) || !(object = ast_sorcery_alloc(sorcery, type, key)) || ast_sorcery_objectset_apply(sorcery, object, objset)) { + regfree(&expression); return; } |