kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-09 11:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix memory leak in 'manager show event' when command entered incorrectly

Browse Source 
When the CLI command 'manager show event' was run incorrectly and its usage
instructions returned, a reference to the event container was leaked. This
would prevent the container from being reclaimed when Asterisk exits. We now
properly decrement the count on the ao2 object using the nifty RAII_VAR macro.

Thanks to Russell for helping me stumble on this, and Terry for writing that
ridiculously helpful macro.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@377319 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2012-12-06 14:11:21 +00:00
parent e875e4b2c0
commit 2c31cfe3b3
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/manager.c
View File

@@ -7117,7 +7117,7 @@ static char *handle_manager_show_events(struct ast_cli_entry *e, int cmd, struct
static char *handle_manager_show_event(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a) static char *handle_manager_show_event(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{ {
struct ao2_container *events; RAII_VAR(struct ao2_container *, events, NULL, ao2_cleanup);
struct ao2_iterator it_events; struct ao2_iterator it_events;
struct ast_xml_doc_item *item, *temp; struct ast_xml_doc_item *item, *temp;
int length; int length;
@@ -7152,7 +7152,6 @@ static char *handle_manager_show_event(struct ast_cli_entry *e, int cmd, struct
ao2_ref(item, -1); ao2_ref(item, -1);
} }
ao2_iterator_destroy(&it_events); ao2_iterator_destroy(&it_events);
ao2_ref(events, -1);
return match; return match;
} }
@@ -7162,7 +7161,6 @@ static char *handle_manager_show_event(struct ast_cli_entry *e, int cmd, struct
if (!(item = ao2_find(events, a->argv[3], OBJ_KEY))) { if (!(item = ao2_find(events, a->argv[3], OBJ_KEY))) {
ast_cli(a->fd, "Could not find event '%s'\n", a->argv[3]); ast_cli(a->fd, "Could not find event '%s'\n", a->argv[3]);
ao2_ref(events, -1);
return CLI_SUCCESS; return CLI_SUCCESS;
} }
@@ -7202,7 +7200,6 @@ static char *handle_manager_show_event(struct ast_cli_entry *e, int cmd, struct
} }
ao2_ref(item, -1); ao2_ref(item, -1);
ao2_ref(events, -1);
return CLI_SUCCESS; return CLI_SUCCESS;
} }