kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

astobj2: Correct ao2_iterator opacity violations

Browse Source 
This corrects the ao2_iterator opacity violations in
res_pjsip_session.c by adding a global function to get the number of
elements inside the container hidden behind the iterator.

(closes issue ASTERISK-23053)
Review: https://reviewboard.asterisk.org/r/3111/
Reported by: Richard Mudgett
........

Merged revisions 405253 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@405254 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kinsey Moore
2014-01-09 20:34:19 +00:00
parent bce38c0cc5
commit 51901aa2ed
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_pjsip_session.c
View File

@@ -471,7 +471,7 @@ static int handle_negotiated_sdp(struct ast_sip_session *session, const pjmedia_
};
successful = ao2_callback(session->media, OBJ_MULTIPLE, handle_negotiated_sdp_session_media, &callback_data);
if (successful && ao2_container_count(successful->c) == ao2_container_count(session->media)) {
if (successful && ao2_iterator_count(successful) == ao2_container_count(session->media)) {
/* Nothing experienced a catastrophic failure */
ast_queue_frame(session->channel, &ast_null_frame);
return 0;
@@ -2026,7 +2026,7 @@ static struct pjmedia_sdp_session *create_local_sdp(pjsip_inv_session *inv, stru
/* Now let the handlers add streams of various types, pjmedia will automatically reorder the media streams for us */
successful = ao2_callback_data(session->media, OBJ_MULTIPLE, add_sdp_streams, local, session);
if (!successful || ao2_container_count(successful->c) != ao2_container_count(session->media)) {
if (!successful || ao2_iterator_count(successful) != ao2_container_count(session->media)) {
/* Something experienced a catastrophic failure */
return NULL;
}