commit 628820d6a2ffb4a5224c2d33649dc5472c95a871 parent 75f62ca7825b380f4a8376cdf7d2a624c7ae9852 Author: Dan Baker <dbaker@mozilla.com> Date: Wed, 22 Oct 2025 14:45:09 -0600 Bug 1995393 - Vendor libwebrtc from 4cc505058c Upstream commit: https://webrtc.googlesource.com/src/+/4cc505058c574e3882e8bc7b5c9b71afc2ef7162 sdp munging: separate "unable to parse description" error code instead of considering this an unknown modification. It should not be happening in practice and is done to have a pointer-is-not-null check. Bug: None Change-Id: If0519fb4c70822d08434e3c78218a9fd193c92c2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/403402 Reviewed-by: Evan Shrubsole <eshr@webrtc.org> Commit-Queue: Philipp Hancke <phancke@meta.com> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45305} Diffstat:
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-22T20:42:37.801357+00:00. +libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-22T20:44:54.919368+00:00. # base of lastest vendoring -029cc4f4d7 +4cc505058c diff --git a/third_party/libwebrtc/api/uma_metrics.h b/third_party/libwebrtc/api/uma_metrics.h @@ -185,6 +185,7 @@ enum SdpMungingType { kWithoutCreateAnswer = 2, kWithoutCreateOffer = 3, kNumberOfContents = 4, + kCurrentDescriptionFailedToParse = 5, // This is an internal error. // Transport-related munging. kIceOptions = 20, kIcePwd = 21, diff --git a/third_party/libwebrtc/moz-patch-stack/p0001.patch b/third_party/libwebrtc/moz-patch-stack/p0001.patch @@ -26,10 +26,10 @@ Cr-Branched-From: 9bd64751d9b3b35a820cb72c9029993e218146a1-refs/heads/main@{#452 1 file changed, 6 insertions(+) diff --git a/pc/sdp_munging_detector.cc b/pc/sdp_munging_detector.cc -index 445697251a..88a69b39c8 100644 +index 58e580baa3..7b126d9b26 100644 --- a/pc/sdp_munging_detector.cc +++ b/pc/sdp_munging_detector.cc -@@ -424,6 +424,12 @@ SdpMungingType DetermineSdpMungingType( +@@ -427,6 +427,12 @@ SdpMungingType DetermineSdpMungingType( } // Validate video and audio contents. MediaType media_type = last_created_media_description->type(); diff --git a/third_party/libwebrtc/pc/sdp_munging_detector.cc b/third_party/libwebrtc/pc/sdp_munging_detector.cc @@ -372,7 +372,10 @@ SdpMungingType DetermineSdpMungingType( const SessionDescriptionInterface* last_created_desc) { if (!sdesc || !sdesc->description()) { RTC_LOG(LS_WARNING) << "SDP munging: Failed to parse session description."; - return SdpMungingType::kUnknownModification; + // This is done to ensure the pointers are valid and should not happen at + // this point. + RTC_DCHECK_NOTREACHED(); + return SdpMungingType::kCurrentDescriptionFailedToParse; } if (!last_created_desc || !last_created_desc->description()) {