Author: coreyfarrell Date: Sat Oct 4 19:25:01 2014 New Revision: 424575 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424575 Log: chan_sip: Clean leak on error path of process_sdp
Resolve leak in process_sdp that occurs in 2 error path's where crypto lines are expected but not provided. ASTERISK-24385 #close Reported by: Corey Farrell Review: https://reviewboard.asterisk.org/r/4045/ ........ Merged revisions 424569 from http://svn.asterisk.org/svn/asterisk/branches/11 Modified: branches/12/ (props changed) branches/12/channels/chan_sip.c Propchange: branches/12/ ------------------------------------------------------------------------------ Binary property 'branch-11-merged' - no diff available. Modified: branches/12/channels/chan_sip.c URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/chan_sip.c?view=diff&rev=424575&r1=424574&r2=424575 ============================================================================== --- branches/12/channels/chan_sip.c (original) +++ branches/12/channels/chan_sip.c Sat Oct 4 19:25:01 2014 @@ -10488,10 +10488,12 @@ /* Ensure crypto lines are provided where necessary */ if (audio && secure_audio && !processed_crypto) { ast_log(LOG_WARNING, "Rejecting secure audio stream without encryption details: %s\n", m); - return -1; + res = -1; + goto process_sdp_cleanup_b; } else if (video && secure_video && !processed_crypto) { ast_log(LOG_WARNING, "Rejecting secure video stream without encryption details: %s\n", m); - return -1; + res = -1; + goto process_sdp_cleanup_b; } } @@ -10802,6 +10804,8 @@ if (res) { offered_media_list_destroy(p); } + +process_sdp_cleanup_b: ast_rtp_codecs_payloads_destroy(&newtextrtp); ast_rtp_codecs_payloads_destroy(&newvideortp); ast_rtp_codecs_payloads_destroy(&newaudiortp); -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
