kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve some memory leaks due to incorrect for loop / ao2 ref usage.

Browse Source 
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.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@401248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2013-10-18 18:33:35 +00:00
parent aa4e8c4ab3
commit 82904b87f3
5 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/bucket.c
View File

@@ -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;
}
}