From: Kinsey Moore <kmoore@digium.com>
Date: Thu, 9 Jan 2014 20:34:19 +0000 (+0000)
Subject: astobj2: Correct ao2_iterator opacity violations
X-Git-Tag: 13.0.0-beta1~667
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51901aa2ed0a177ad7a2bca3e22be3c8d39bde25;p=thirdparty%2Fasterisk.git

astobj2: Correct ao2_iterator opacity violations

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
---

diff --git a/include/asterisk/astobj2.h b/include/asterisk/astobj2.h
index 9129c4b67e..2a9be185ad 100644
--- a/include/asterisk/astobj2.h
+++ b/include/asterisk/astobj2.h
@@ -1933,4 +1933,13 @@ void __ao2_cleanup_debug(void *obj, const char *file, int line, const char *func
 #endif
 void ao2_iterator_cleanup(struct ao2_iterator *iter);
 
+/*!
+ * \brief Get a count of the iterated container objects.
+ *
+ * \param iter the iterator to query
+ *
+ * \retval The number of objects in the iterated container
+ */
+int ao2_iterator_count(struct ao2_iterator *iter);
+
 #endif /* _ASTERISK_ASTOBJ2_H */
diff --git a/main/astobj2.c b/main/astobj2.c
index 614e170960..ec80f64896 100644
--- a/main/astobj2.c
+++ b/main/astobj2.c
@@ -1682,6 +1682,11 @@ void *__ao2_iterator_next(struct ao2_iterator *iter)
 	return internal_ao2_iterator_next(iter, NULL, __FILE__, __LINE__, __PRETTY_FUNCTION__);
 }
 
+int ao2_iterator_count(struct ao2_iterator *iter)
+{
+	return ao2_container_count(iter->c);
+}
+
 static void container_destruct(void *_c)
 {
 	struct ao2_container *c = _c;
diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index caaed317a5..d548d29b8d 100644
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -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;
 	}