From fb3564de50945cb42022e88a8a7be4273fdfa632 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 17 Jun 2008 21:26:31 +0000 Subject: [PATCH] _ys pointed out in #asterisk-bugs that he was experiencing a memory leak when running the astobj2 test CLI command. After searching, it appears the leak was in the command handler itself. Each object was allocated (recount = 1) and then linked into a container (refounct = 2). Then at the end of the function, the container was unreffed, causing all the objects to have their refcount decremented by one, leaving the refcount for all objects allocated in that function at 1. I've now added an extra unref to the mix so that the refcount equals zero when the container is unreffed. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@123526 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/astobj2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/main/astobj2.c b/main/astobj2.c index e9e2db7e5f..3911548283 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -930,6 +930,12 @@ static char *handle_astobj2_test(struct ast_cli_entry *e, int cmd, struct ast_cl ast_cli(a->fd, "object %d allocated as %p\n", i, obj); sprintf(obj, "-- this is obj %d --", i); ao2_link(c1, obj); + /* At this point, the refcount on obj is 2 due to the allocation + * and linking. We can go ahead and reduce the refcount by 1 + * right here so that when the container is unreffed later, the + * objects will be freed + */ + ao2_t_ref(obj, -1, test); } ast_cli(a->fd, "testing callbacks\n"); ao2_t_callback(c1, 0, print_cb, &a->fd,"test callback");