diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2011-02-09 21:08:22 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2011-02-09 21:08:22 +0000 |
| commit | 10362292efd1b26c41394ca70992c0aa8908f53a (patch) | |
| tree | f99fd18b6ed37a8356128c6f0ccc96a641adbc05 /main | |
| parent | e2df2466360fc4f52ea5c6721089d7b5619114f2 (diff) | |
Merged revisions 307273 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r307273 | jpeeler | 2011-02-09 15:06:33 -0600 (Wed, 09 Feb 2011) | 8 lines
Add missing debug info for ao2_link for use with REF_DEBUG in ao2 callback.
(closes issue #18758)
Reported by: rgagnon
Patches:
branch-1.8-r306540-astobj-fix.diff uploaded by rgagnon (license 1202)
trunk-r306540-astobj-fix.diff uploaded by rgagnon (license 1202)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/astobj2.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/main/astobj2.c b/main/astobj2.c index 6391844fe..5e61d5e5f 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -705,7 +705,11 @@ static void *internal_ao2_callback(struct ao2_container *c, * link the object into the container that will hold the results. */ if (ret && (multi_container != NULL)) { - __ao2_link(multi_container, ret, flags); + if (tag) { + __ao2_link_debug(multi_container, ret, flags, tag, file, line, funcname); + } else { + __ao2_link(multi_container, ret, flags); + } ret = NULL; } |