From d38b84ec27f7d5c9385d28fb1d7c6fbc96d736c1 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 7 Jun 2024 09:03:24 +0000 Subject: [PATCH] Fix UBsan error in TurnPortTest.TestChannelBindGetErrorResponse. With the new version of UBsan, this test triggers: ../../p2p/base/turn_port.cc:1728:45: runtime error: left shift of negative value -1 because of: message->AddAttribute(std::make_unique( STUN_ATTR_CHANNEL_NUMBER, channel_id_ << 16)); Bug: b/344601229 Change-Id: I8e730e805eb6bb70f141fc1c178d48a59575b612 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/353900 Auto-Submit: Mirko Bonadei Commit-Queue: Mirko Bonadei Reviewed-by: Tomas Gunnarsson Cr-Commit-Position: refs/heads/main@{#42444} --- p2p/base/turn_port_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/p2p/base/turn_port_unittest.cc b/p2p/base/turn_port_unittest.cc index 66a154048b..8f81ad37ca 100644 --- a/p2p/base/turn_port_unittest.cc +++ b/p2p/base/turn_port_unittest.cc @@ -1521,8 +1521,8 @@ TEST_F(TurnPortTest, TestChannelBindGetErrorResponse) { // TODO(deadbeef): SetEntryChannelId should not be a public method. // Instead we should set an option on the fake TURN server to force it to // send a channel bind errors. - ASSERT_TRUE( - turn_port_->SetEntryChannelId(udp_port_->Candidates()[0].address(), -1)); + ASSERT_TRUE(turn_port_->SetEntryChannelId( + udp_port_->Candidates()[0].address(), /*channel_id=*/1)); std::string data = "ABC"; conn1->Send(data.data(), data.length(), options);