Changeset 5487 for pjproject/trunk

Timestamp:

Nov 21, 2016 1:38:04 AM (7 years ago)

Author:

ming

Message:

Fixed #1980: Assertion if remote removes some media lines in previous SDP negotiations

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -2312 +2312 @@
                         pjmedia_sdp_neg_get_active_local(call->inv->neg, &s_);
 
-                        pj_assert(mi < s_->media_count);
-                        m = pjmedia_sdp_media_clone(pool, s_->media[mi]);
-                        m->desc.port = 0;
+                        if (mi < s_->media_count) {
+                            m = pjmedia_sdp_media_clone(pool, s_->media[mi]);
+                            m->desc.port = 0;
+                        } else {
+                            /* Remote may have removed some media lines in
+                             * previous negotiations. However, since our
+                             * media count may never decrease (as per
+                             * the RFC), we'll just offer unknown media here.
+                             */
+                            m->desc.media = pj_str("unknown");
+                            m->desc.fmt[0] = pj_str("0");
+                        }
                     }
                     break;