commit 27bc6e224696b1be26deca032578623ac34f72cb
author Tomas Gunnarsson <tommi@webrtc.org> Fri Feb 12 13:16:26 2021 +0100
committer Commit Bot <commit-bot@chromium.org> Fri Feb 12 13:35:03 2021 +0000
tree 079e3ef40bd7d6ce076955d6c54a24e1ea9710af
parent 1ba1fc9598c46b281bc16635c90752f26241a8ac

Reverting to previous behavior due to a downstream test expectation.

This reverts the change in behavior for setRemoteDescription,
introduced here:
https://webrtc-review.googlesource.com/c/src/+/206063

And disables the associated test.

Bug: webrtc:9987
Change-Id: I39a5664032a967a0a9cd336fa585d4d3880c88c5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/207162
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33248}

pc/peer_connection_ice_unittest.cc

diff --git a/pc/peer_connection_ice_unittest.cc b/pc/peer_connection_ice_unittest.cc
index f37943f..6fabd51 100644
--- a/pc/peer_connection_ice_unittest.cc
+++ b/pc/peer_connection_ice_unittest.cc
@@ -497,7 +497,10 @@
   EXPECT_EQ(1u, caller->GetIceCandidatesFromRemoteDescription().size());
 }
 
-TEST_P(PeerConnectionIceTest, ErrorOnInvalidRemoteIceCandidateAdded) {
+// TODO(tommi): Re-enable after updating RTCPeerConnection-blockedPorts.html in
+// Chromium (the test needs setRemoteDescription to succeed for an invalid
+// candidate).
+TEST_P(PeerConnectionIceTest, DISABLED_ErrorOnInvalidRemoteIceCandidateAdded) {
   auto caller = CreatePeerConnectionWithAudioVideo();
   auto callee = CreatePeerConnectionWithAudioVideo();
   ASSERT_TRUE(callee->SetRemoteDescription(caller->CreateOfferAndSetAsLocal()));

pc/sdp_offer_answer.cc

diff --git a/pc/sdp_offer_answer.cc b/pc/sdp_offer_answer.cc
index b0a594b..4317bca 100644
--- a/pc/sdp_offer_answer.cc
+++ b/pc/sdp_offer_answer.cc
@@ -4478,8 +4478,10 @@
 
   const cricket::Candidate& c = candidate->candidate();
   RTCError error = cricket::VerifyCandidate(c);
-  if (!error.ok())
-    return false;
+  if (!error.ok()) {
+    RTC_LOG(LS_WARNING) << "Invalid candidate: " << c.ToString();
+    return true;
+  }
 
   pc_->AddRemoteCandidate(result.value()->name, c);