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/bucket.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/bucket.c')
| -rw-r--r-- | main/bucket.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/bucket.c b/main/bucket.c index 3ad476528..8f6acdaa5 100644 --- a/main/bucket.c +++ b/main/bucket.c @@ -520,6 +520,7 @@ struct ast_json *ast_bucket_json(const struct ast_bucket *bucket) if (!bucket_uri || ast_json_array_append(buckets, bucket_uri)) { res = -1; + ao2_ref(uri, -1); break; } } @@ -544,6 +545,7 @@ struct ast_json *ast_bucket_json(const struct ast_bucket *bucket) if (!file_uri || ast_json_array_append(files, file_uri)) { res = -1; + ao2_ref(uri, -1); break; } } |