You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.5 KiB
46 lines
1.5 KiB
From 97b3d7addbaa720b7ddb0af9bf6f3e443e664365 Mon Sep 17 00:00:00 2001
|
|
From: Nanang Izzuddin <nanang@teluu.com>
|
|
Date: Mon, 8 Mar 2021 16:09:34 +0700
|
|
Subject: [PATCH] Merge pull request from GHSA-hvq6-f89p-frvp
|
|
|
|
---
|
|
pjmedia/src/pjmedia/sdp_neg.c | 14 ++++++++++++--
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c
|
|
index f4838f75d..9f76b5200 100644
|
|
--- a/pjmedia/src/pjmedia/sdp_neg.c
|
|
+++ b/pjmedia/src/pjmedia/sdp_neg.c
|
|
@@ -304,7 +304,6 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2(
|
|
{
|
|
pjmedia_sdp_session *new_offer;
|
|
pjmedia_sdp_session *old_offer;
|
|
- char media_used[PJMEDIA_MAX_SDP_MEDIA];
|
|
unsigned oi; /* old offer media index */
|
|
pj_status_t status;
|
|
|
|
@@ -323,8 +322,19 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modify_local_offer2(
|
|
/* Change state to STATE_LOCAL_OFFER */
|
|
neg->state = PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER;
|
|
|
|
+ /* When there is no active local SDP in state PJMEDIA_SDP_NEG_STATE_DONE,
|
|
+ * it means that the previous initial SDP nego must have been failed,
|
|
+ * so we'll just set the local SDP offer here.
|
|
+ */
|
|
+ if (!neg->active_local_sdp) {
|
|
+ neg->initial_sdp_tmp = NULL;
|
|
+ neg->initial_sdp = pjmedia_sdp_session_clone(pool, local);
|
|
+ neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local);
|
|
+
|
|
+ return PJ_SUCCESS;
|
|
+ }
|
|
+
|
|
/* Init vars */
|
|
- pj_bzero(media_used, sizeof(media_used));
|
|
old_offer = neg->active_local_sdp;
|
|
new_offer = pjmedia_sdp_session_clone(pool, local);
|
|
|
|
--
|
|
2.26.2
|
|
|