diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-01-27 18:47:16 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-01-27 18:47:16 +0000 |
| commit | 27b69e7d29dc100e5fdf3cf911c3a02f3b5fd2b5 (patch) | |
| tree | 7ad1cbac33a65eb9773db40058cabff69fe2eef1 /res/res_odbc.c | |
| parent | 5bfea5fdbfca835b29e14ec9a28345c6095431b5 (diff) | |
Audit of ao2_iterator_init() usage for v1.8.
Fixes numerous reference leaks and missing ao2_iterator_destroy() calls as
a result.
Review: https://reviewboard.asterisk.org/r/1697/
........
Merged revisions 352955 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 352956 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@352957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_odbc.c')
| -rw-r--r-- | res/res_odbc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/res/res_odbc.c b/res/res_odbc.c index 1770bb303..463bf9fdb 100644 --- a/res/res_odbc.c +++ b/res/res_odbc.c @@ -911,7 +911,7 @@ static int load_odbc_config(void) static char *handle_cli_odbc_show(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) { - struct ao2_iterator aoi = ao2_iterator_init(class_container, 0); + struct ao2_iterator aoi; struct odbc_class *class; struct odbc_obj *current; int length = 0; @@ -930,6 +930,7 @@ static char *handle_cli_odbc_show(struct ast_cli_entry *e, int cmd, struct ast_c if (a->pos != 2) return NULL; length = strlen(a->word); + aoi = ao2_iterator_init(class_container, 0); while ((class = ao2_iterator_next(&aoi))) { if (!strncasecmp(a->word, class->name, length) && ++which > a->n) { ret = ast_strdup(class->name); @@ -1722,12 +1723,14 @@ static int data_odbc_provider_handler(const struct ast_data_search *search, ao2_ref(current, -1); } + ao2_iterator_destroy(&aoi2); ao2_ref(class, -1); if (!ast_data_search_match(search, data_odbc_class)) { ast_data_remove_node(root, data_odbc_class); } } + ao2_iterator_destroy(&aoi); return 0; } |