diff options
author | Corey Farrell <git@cfware.com> | 2015-04-06 15:17:18 +0000 |
---|---|---|
committer | Corey Farrell <git@cfware.com> | 2015-04-06 15:17:18 +0000 |
commit | ffd7319df337a2b99f4df4422b27d8aee07697af (patch) | |
tree | 4be1c9df721f7c067655638f4689aa79b33f1cbe | |
parent | 53af579d4c198cd754ce7b3b3e230d511b238b6f (diff) |
res_pjsip_phoneprov_provider: Revert 433996 / 433997.
res_pjsip_phoneprov_provider is using ao2_callback with OBJ_MULTIPLE, then
ignoring the return. OBJ_NODATA flag was to prevent a reference leak, but
this caused the module to FRACK on unload. Revert change until this can
be investigated further.
ASTERISK-24935
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4578/
........
Merged revisions 434025 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@434026 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | res/res_pjsip_phoneprov_provider.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_pjsip_phoneprov_provider.c b/res/res_pjsip_phoneprov_provider.c index 656fdd295..70dd99e06 100644 --- a/res/res_pjsip_phoneprov_provider.c +++ b/res/res_pjsip_phoneprov_provider.c @@ -353,7 +353,7 @@ static int load_users(void) return 0; } - ao2_callback(users, OBJ_MULTIPLE | OBJ_NODATA, users_apply_handler, sorcery); + ao2_callback(users, OBJ_MULTIPLE, users_apply_handler, sorcery); ao2_ref(users, -1); return 0; |