sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jeff Peeler 2011-02-09 21:08:22 +00:00
parent e2df246636
commit 10362292ef
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/astobj2.c
View File

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