aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-09 21:06:33 +0000
committerjpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>2011-02-09 21:06:33 +0000
commit3527c657bfe007ffb03d079f7360c525ab773c49 (patch)
treebc2f7cfd4e2d0ad3f5ecedf875f9e89ae00cfdb6
parent243a9dfd0ca725ab46bf681df84df9628ab8aafa (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.8@307273 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/astobj2.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/main/astobj2.c b/main/astobj2.c
index 07d46bb6f..3e853a7a2 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -693,7 +693,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);
+ if (tag) {
+ __ao2_link_debug(multi_container, ret, tag, file, line, funcname);
+ } else {
+ __ao2_link(multi_container, ret);
+ }
ret = NULL;
}