From 7f6593207397cf5b0970242b18a3ad9809b1eb75 Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Fri, 23 Aug 2019 14:52:14 +0200 Subject: [PATCH] Fix for sanitizer bot failure in AudioUsesAbsSendTimeExtension Bug: webrtc:10904 Change-Id: Id37a88afd85c522a7973f6dc9e8dd331a04d3fae Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/150325 Reviewed-by: Yves Gerey Commit-Queue: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#28981} --- test/peer_scenario/tests/remote_estimate_test.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/peer_scenario/tests/remote_estimate_test.cc b/test/peer_scenario/tests/remote_estimate_test.cc index 81d788cd9f..16ad2c721b 100644 --- a/test/peer_scenario/tests/remote_estimate_test.cc +++ b/test/peer_scenario/tests/remote_estimate_test.cc @@ -72,6 +72,8 @@ TEST(RemoteEstimateEndToEnd, OfferedCapabilityIsInAnswer) { TEST(RemoteEstimateEndToEnd, AudioUsesAbsSendTimeExtension) { ScopedFieldTrials trials("WebRTC-KeepAbsSendTimeExtension/Enabled/"); + // Defined before PeerScenario so it gets destructed after, to avoid use after free. + rtc::Event received_abs_send_time; PeerScenario s; auto* caller = s.CreateClient(PeerScenarioClient::Config()); @@ -99,7 +101,6 @@ TEST(RemoteEstimateEndToEnd, AudioUsesAbsSendTimeExtension) { offer_exchange_done.Set(); }); EXPECT_TRUE(s.WaitAndProcess(&offer_exchange_done)); - rtc::Event received_abs_send_time; send_node->router()->SetWatcher( [extension_map, &received_abs_send_time](const EmulatedIpPacket& packet) { auto extensions = GetRtpPacketExtensions(packet.data, extension_map);