diff options
| author | Mark Michelson <mmichelson@digium.com> | 2013-10-18 18:44:21 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2013-10-18 18:44:21 +0000 |
| commit | c30170d9a22255e35606a8c506e398f817a5c15c (patch) | |
| tree | b2ee714b06705a0ea2e52caefb0fafcbf52bc7f4 /main/cli.c | |
| parent | 057d105c5ab47f132036a6f54c1dae636a9442bd (diff) | |
Resolve some memory leaks due to incorrect for loop / ao2 ref usage.
A common idiom in Asterisk is to due something like:
for (ao2_obj = list_beginning; ao2_obj = next_item; ao2_ref(ao2_obj, -1)) {
...do stuff...
}
This is nice because it automatically takes care of the object references
for you. However, there is a pitfall here. If a break statement is in the
for loop, then the current reference is not cleaned up. In some cases, this
is on purpose, but in others there is a leak. This commit fixes the leak
cases.
........
Merged revisions 401248 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@401249 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/cli.c')
| -rw-r--r-- | main/cli.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/cli.c b/main/cli.c index 9d9fda4f1..a9f466499 100644 --- a/main/cli.c +++ b/main/cli.c @@ -1581,6 +1581,7 @@ char *ast_complete_channels(const char *line, const char *word, int pos, int sta if (!strncasecmp(word, snapshot->name, wordlen) && (++which > state)) { ret = ast_strdup(snapshot->name); + ao2_ref(msg, -1); break; } } |