[asterisk-dev] [Code Review] 4608: res_pjsip_phoneprov_provider: Fix reference leak on unload

[George Joseph]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/4608/
-----------------------------------------------------------

(Updated April 9, 2015, 5:35 p.m.)


Status
------

This change has been marked as submitted.


Review request for Asterisk Developers and Corey Farrell.


Changes
-------

Committed in revision 434545


Bugs: ASTERISK-24935
    https://issues.asterisk.org/jira/browse/ASTERISK-24935


Repository: Asterisk


Description
-------

res_pjsip_phoneprov_provider was leaking references to phoneprov objects due to a missing OBJ_NODATA in an ao2_callback in load_users().  Rather than adding the OBJ_NODATA, I changed load_users to use a more straightforward ao2_iterator.  This plugged the leak but exposed an unload order issue between res_pjsip_phoneprov_provider, res_phoneprov and res_pjsip.

res_pjsip_phoneprov_provider unloads first, then res_phoneprov, then res_pjsip.  Since res_pjsip_phoneprov_provider uses res_pjsip's sorcery instance, when it unloads, it's objects are still in the sorcery instance.  When res_pjsip unloads, it destroys all its objects including res_pjsip_phoneprov_provider's.  The phoneprov destructor then attempts to unregister the extension from res_phoneprov but because res_phoneprov is already cleaned up, its users container is gone and we get a FRACK.

Simple solution, check for the NULL users container before attempting to remove the entry. Duh.


Diffs
-----

  branches/13/res/res_pjsip_phoneprov_provider.c 434447 
  branches/13/res/res_phoneprov.c 434447 

Diff: https://reviewboard.asterisk.org/r/4608/diff/


Testing
-------

Ran tests/res_phoneprov/res_phoneprov_provider.  No leaks in res_pjsip_phoneprov_provider and no FRACKs.


Thanks,

George Joseph

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20150409/da341dc3/attachment.html>