diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-05-01 23:21:07 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-05-01 23:21:07 +0000 |
| commit | 1420522c6e9abcc0a5247c3179d1730c942e9c24 (patch) | |
| tree | 79d39b5c167aac1701ad5a14a9cefca8befc1709 /main/astobj2.c | |
| parent | b5f0647fc87a7c420e6154955fb160917fb3b197 (diff) | |
Fixed __ao2_ref() validating user_data twice.
(closes issue ASTERISK-19755)
Reported by: Gunther Kelleter
Patches:
ao2_ref.patch (license #6372) patch uploaded by Gunther Kelleter
........
Merged revisions 364902 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 364903 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@364910 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/astobj2.c')
| -rw-r--r-- | main/astobj2.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/main/astobj2.c b/main/astobj2.c index 20d977ba3..b689dbbe5 100644 --- a/main/astobj2.c +++ b/main/astobj2.c @@ -514,7 +514,7 @@ int __ao2_ref_debug(void *user_data, int delta, const char *tag, const char *fil FILE *refo = fopen(REF_FILE, "a"); if (refo) { fprintf(refo, "%p %s%d %s:%d:%s (%s) [@%d]\n", user_data, (delta < 0 ? "" : "+"), - delta, file, line, func, tag, obj ? obj->priv_data.ref_counter : -1); + delta, file, line, func, tag, obj->priv_data.ref_counter); fclose(refo); } } @@ -530,11 +530,6 @@ int __ao2_ref_debug(void *user_data, int delta, const char *tag, const char *fil int __ao2_ref(void *user_data, int delta) { - struct astobj2 *obj = INTERNAL_OBJ(user_data); - - if (obj == NULL) - return -1; - return internal_ao2_ref(user_data, delta, __FILE__, __LINE__, __FUNCTION__); } |