-
Notifications
You must be signed in to change notification settings - Fork 15.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: cherry-pick 5 changes from Release-2-M114, Release-1-M110 and …
…Release-0-M110 (#38789) * chore: [22-x-y] cherry-pick 1 changes from Release-2-M114 * 2e76270cf65e from v8 * chore: update patches * chore: update patches --------- Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
- Loading branch information
1 parent
047f474
commit a68e328
Showing
9 changed files
with
287 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 96 additions & 0 deletions
96
patches/chromium/base_do_not_use_va_args_twice_in_asprintf.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Benoit Lize <lizeb@chromium.org> | ||
| Date: Fri, 9 Jun 2023 17:59:08 +0000 | ||
| Subject: Do not use va_args twice in asprintf() | ||
|
|
||
| (cherry picked from commit 3cff0cb19a6d01cbdd9932f43dabaaeda9c0330a) | ||
|
|
||
| Bug: 1450536 | ||
| Change-Id: Ib34d96935278869a63897f9a1c66afc98865d90f | ||
| Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4579347 | ||
| Reviewed-by: Egor Pasko <pasko@chromium.org> | ||
| Commit-Queue: Benoit Lize <lizeb@chromium.org> | ||
| Cr-Original-Commit-Position: refs/heads/main@{#1151796} | ||
| Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4604070 | ||
| Reviewed-by: Michael Thiessen <mthiesse@chromium.org> | ||
| Cr-Commit-Position: refs/branch-heads/5735@{#1224} | ||
| Cr-Branched-From: 2f562e4ddbaf79a3f3cb338b4d1bd4398d49eb67-refs/heads/main@{#1135570} | ||
|
|
||
| diff --git a/base/allocator/partition_allocator/shim/allocator_shim_override_linker_wrapped_symbols.h b/base/allocator/partition_allocator/shim/allocator_shim_override_linker_wrapped_symbols.h | ||
| index 621873126602463a09efca1bf1548ed10910d323..de2af6d7d54e254b9e7b8264b53d30a338fb13e8 100644 | ||
| --- a/base/allocator/partition_allocator/shim/allocator_shim_override_linker_wrapped_symbols.h | ||
| +++ b/base/allocator/partition_allocator/shim/allocator_shim_override_linker_wrapped_symbols.h | ||
| @@ -123,13 +123,21 @@ SHIM_ALWAYS_EXPORT char* __wrap_getcwd(char* buffer, size_t size) { | ||
| SHIM_ALWAYS_EXPORT int __wrap_vasprintf(char** strp, | ||
| const char* fmt, | ||
| va_list va_args) { | ||
| + // There are cases where we need to use the list of arguments twice, namely | ||
| + // when the original buffer is too small. It is not allowed to walk the list | ||
| + // twice, so make a copy for the second invocation of vsnprintf(). | ||
| + va_list va_args_copy; | ||
| + va_copy(va_args_copy, va_args); | ||
| + | ||
| constexpr int kInitialSize = 128; | ||
| *strp = static_cast<char*>( | ||
| malloc(kInitialSize)); // Our malloc() doesn't return nullptr. | ||
|
|
||
| int actual_size = vsnprintf(*strp, kInitialSize, fmt, va_args); | ||
| - if (actual_size < 0) | ||
| + if (actual_size < 0) { | ||
| + va_end(va_args_copy); | ||
| return actual_size; | ||
| + } | ||
| *strp = | ||
| static_cast<char*>(realloc(*strp, static_cast<size_t>(actual_size + 1))); | ||
|
|
||
| @@ -139,9 +147,14 @@ SHIM_ALWAYS_EXPORT int __wrap_vasprintf(char** strp, | ||
| // | ||
| // This is very lightly used in Chromium in practice, see crbug.com/116558 for | ||
| // details. | ||
| - if (actual_size >= kInitialSize) | ||
| - return vsnprintf(*strp, static_cast<size_t>(actual_size + 1), fmt, va_args); | ||
| - | ||
| + if (actual_size >= kInitialSize) { | ||
| + int ret = vsnprintf(*strp, static_cast<size_t>(actual_size + 1), fmt, | ||
| + va_args_copy); | ||
| + va_end(va_args_copy); | ||
| + return ret; | ||
| + } | ||
| + | ||
| + va_end(va_args_copy); | ||
| return actual_size; | ||
| } | ||
|
|
||
| diff --git a/base/allocator/partition_allocator/shim/allocator_shim_unittest.cc b/base/allocator/partition_allocator/shim/allocator_shim_unittest.cc | ||
| index 6caf9d6ffe0db92602ac1e448f45da422e077c2c..57d36f722e1aa747cda3a808104cc108147552c1 100644 | ||
| --- a/base/allocator/partition_allocator/shim/allocator_shim_unittest.cc | ||
| +++ b/base/allocator/partition_allocator/shim/allocator_shim_unittest.cc | ||
| @@ -706,6 +706,28 @@ TEST_F(AllocatorShimTest, InterceptVasprintf) { | ||
| // Should not crash. | ||
| } | ||
|
|
||
| +TEST_F(AllocatorShimTest, InterceptLongVasprintf) { | ||
| + char* str = nullptr; | ||
| + const char* lorem_ipsum = | ||
| + "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed non risus. " | ||
| + "Suspendisse lectus tortor, dignissim sit amet, adipiscing nec, " | ||
| + "ultricies sed, dolor. Cras elementum ultrices diam. Maecenas ligula " | ||
| + "massa, varius a, semper congue, euismod non, mi. Proin porttitor, orci " | ||
| + "nec nonummy molestie, enim est eleifend mi, non fermentum diam nisl sit " | ||
| + "amet erat. Duis semper. Duis arcu massa, scelerisque vitae, consequat " | ||
| + "in, pretium a, enim. Pellentesque congue. Ut in risus volutpat libero " | ||
| + "pharetra tempor. Cras vestibulum bibendum augue. Praesent egestas leo " | ||
| + "in pede. Praesent blandit odio eu enim. Pellentesque sed dui ut augue " | ||
| + "blandit sodales. Vestibulum ante ipsum primis in faucibus orci luctus " | ||
| + "et ultrices posuere cubilia Curae; Aliquam nibh. Mauris ac mauris sed " | ||
| + "pede pellentesque fermentum. Maecenas adipiscing ante non diam sodales " | ||
| + "hendrerit."; | ||
| + int err = asprintf(&str, "%s", lorem_ipsum); | ||
| + EXPECT_EQ(err, static_cast<int>(strlen(lorem_ipsum))); | ||
| + EXPECT_TRUE(str); | ||
| + free(str); | ||
| +} | ||
| + | ||
| #endif // BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) | ||
|
|
||
| #endif // BUILDFLAG(IS_ANDROID) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Shu-yu Guo <syg@chromium.org> | ||
| Date: Mon, 5 Jun 2023 16:05:52 -0700 | ||
| Subject: Merged: Check for encoding when appending in string builder | ||
|
|
||
| Fixed: chromium:1450114 | ||
| (cherry picked from commit a7e2bef27b72f187a7dcdf95714df686f56d9e0b) | ||
|
|
||
| Change-Id: I5838383b6b12d137e84c8a36863ef88000e85c76 | ||
| Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4604652 | ||
| Reviewed-by: Igor Sheludko <ishell@chromium.org> | ||
| Cr-Commit-Position: refs/branch-heads/11.4@{#41} | ||
| Cr-Branched-From: 8a8a1e7086dacc426965d3875914efa66663c431-refs/heads/11.4.183@{#1} | ||
| Cr-Branched-From: 5483d8e816e0bbce865cbbc3fa0ab357e6330bab-refs/heads/main@{#87241} | ||
|
|
||
| diff --git a/src/strings/string-builder.cc b/src/strings/string-builder.cc | ||
| index 9d1e3a95746b47b99c15f18ec593549d79e10b8c..c7e98e55763aba2d64f4070e25759489f850f589 100644 | ||
| --- a/src/strings/string-builder.cc | ||
| +++ b/src/strings/string-builder.cc | ||
| @@ -306,12 +306,21 @@ bool IncrementalStringBuilder::CanAppendByCopy(Handle<String> string) { | ||
| void IncrementalStringBuilder::AppendStringByCopy(Handle<String> string) { | ||
| DCHECK(CanAppendByCopy(string)); | ||
|
|
||
| - Handle<SeqOneByteString> part = | ||
| - Handle<SeqOneByteString>::cast(current_part()); | ||
| { | ||
| DisallowGarbageCollection no_gc; | ||
| - String::WriteToFlat(*string, part->GetChars(no_gc) + current_index_, 0, | ||
| - string->length()); | ||
| + if (encoding_ == String::ONE_BYTE_ENCODING) { | ||
| + String::WriteToFlat( | ||
| + *string, | ||
| + Handle<SeqOneByteString>::cast(current_part())->GetChars(no_gc) + | ||
| + current_index_, | ||
| + 0, string->length()); | ||
| + } else { | ||
| + String::WriteToFlat( | ||
| + *string, | ||
| + Handle<SeqTwoByteString>::cast(current_part())->GetChars(no_gc) + | ||
| + current_index_, | ||
| + 0, string->length()); | ||
| + } | ||
| } | ||
| current_index_ += string->length(); | ||
| DCHECK(current_index_ <= part_length_); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| cherry-pick-e0efbd45ea74.patch | ||
| cherry-pick-218b56e51638.patch | ||
| m114_move_transceiver_iteration_loop_over_to_the_signaling_thread.patch |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
126 changes: 126 additions & 0 deletions
126
patches/webrtc/m114_move_transceiver_iteration_loop_over_to_the_signaling_thread.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Tommi <tommi@webrtc.org> | ||
| Date: Thu, 1 Jun 2023 16:08:52 +0200 | ||
| Subject: Move transceiver iteration loop over to the signaling thread. | ||
|
|
||
| This is required for ReportTransportStats since iterating over the | ||
| transceiver list from the network thread is not safe. | ||
|
|
||
| (cherry picked from commit dba22d31909298161318e00d43a80cdb0abc940f) | ||
|
|
||
| No-Try: true | ||
| Bug: chromium:1446274, webrtc:12692 | ||
| Change-Id: I7c514df9f029112c4b1da85826af91217850fb26 | ||
| Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/307340 | ||
| Reviewed-by: Harald Alvestrand <hta@webrtc.org> | ||
| Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> | ||
| Cr-Original-Commit-Position: refs/heads/main@{#40197} | ||
| Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/308001 | ||
| Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> | ||
| Cr-Commit-Position: refs/branch-heads/5735@{#3} | ||
| Cr-Branched-From: df7df199abd619e75b9f1d9a7e12fc3f3f748775-refs/heads/main@{#39949} | ||
|
|
||
| diff --git a/pc/peer_connection.cc b/pc/peer_connection.cc | ||
| index 4615ce5a2c413dba798c3f9f8f7d4c1ae78bf9af..62179cd44c57dc6d808579353b398412db5e1ed6 100644 | ||
| --- a/pc/peer_connection.cc | ||
| +++ b/pc/peer_connection.cc | ||
| @@ -716,9 +716,6 @@ JsepTransportController* PeerConnection::InitializeTransportController_n( | ||
| transport_controller_->SubscribeIceConnectionState( | ||
| [this](cricket::IceConnectionState s) { | ||
| RTC_DCHECK_RUN_ON(network_thread()); | ||
| - if (s == cricket::kIceConnectionConnected) { | ||
| - ReportTransportStats(); | ||
| - } | ||
| signaling_thread()->PostTask( | ||
| SafeTask(signaling_thread_safety_.flag(), [this, s]() { | ||
| RTC_DCHECK_RUN_ON(signaling_thread()); | ||
| @@ -2372,6 +2369,20 @@ void PeerConnection::OnTransportControllerConnectionState( | ||
| case cricket::kIceConnectionConnected: | ||
| RTC_LOG(LS_INFO) << "Changing to ICE connected state because " | ||
| "all transports are writable."; | ||
| + { | ||
| + std::vector<RtpTransceiverProxyRefPtr> transceivers; | ||
| + if (ConfiguredForMedia()) { | ||
| + transceivers = rtp_manager()->transceivers()->List(); | ||
| + } | ||
| + | ||
| + network_thread()->PostTask( | ||
| + SafeTask(network_thread_safety_, | ||
| + [this, transceivers = std::move(transceivers)] { | ||
| + RTC_DCHECK_RUN_ON(network_thread()); | ||
| + ReportTransportStats(std::move(transceivers)); | ||
| + })); | ||
| + } | ||
| + | ||
| SetIceConnectionState(PeerConnectionInterface::kIceConnectionConnected); | ||
| NoteUsageEvent(UsageEvent::ICE_STATE_CONNECTED); | ||
| break; | ||
| @@ -2701,20 +2712,18 @@ void PeerConnection::OnTransportControllerGatheringState( | ||
| } | ||
|
|
||
| // Runs on network_thread(). | ||
| -void PeerConnection::ReportTransportStats() { | ||
| +void PeerConnection::ReportTransportStats( | ||
| + std::vector<RtpTransceiverProxyRefPtr> transceivers) { | ||
| TRACE_EVENT0("webrtc", "PeerConnection::ReportTransportStats"); | ||
| rtc::Thread::ScopedDisallowBlockingCalls no_blocking_calls; | ||
| std::map<std::string, std::set<cricket::MediaType>> | ||
| media_types_by_transport_name; | ||
| - if (ConfiguredForMedia()) { | ||
| - for (const auto& transceiver : | ||
| - rtp_manager()->transceivers()->UnsafeList()) { | ||
| - if (transceiver->internal()->channel()) { | ||
| - std::string transport_name( | ||
| - transceiver->internal()->channel()->transport_name()); | ||
| - media_types_by_transport_name[transport_name].insert( | ||
| - transceiver->media_type()); | ||
| - } | ||
| + for (const auto& transceiver : transceivers) { | ||
| + if (transceiver->internal()->channel()) { | ||
| + std::string transport_name( | ||
| + transceiver->internal()->channel()->transport_name()); | ||
| + media_types_by_transport_name[transport_name].insert( | ||
| + transceiver->media_type()); | ||
| } | ||
| } | ||
|
|
||
| diff --git a/pc/peer_connection.h b/pc/peer_connection.h | ||
| index 36a9d2ac743a81e2c4ac8b4abd73d2fd40c3dd40..ea221e697322bd8b8c161edada7a448a68fa7f68 100644 | ||
| --- a/pc/peer_connection.h | ||
| +++ b/pc/peer_connection.h | ||
| @@ -563,7 +563,8 @@ class PeerConnection : public PeerConnectionInternal, | ||
|
|
||
| // Invoked when TransportController connection completion is signaled. | ||
| // Reports stats for all transports in use. | ||
| - void ReportTransportStats() RTC_RUN_ON(network_thread()); | ||
| + void ReportTransportStats(std::vector<RtpTransceiverProxyRefPtr> transceivers) | ||
| + RTC_RUN_ON(network_thread()); | ||
|
|
||
| // Gather the usage of IPv4/IPv6 as best connection. | ||
| static void ReportBestConnectionState(const cricket::TransportStats& stats); | ||
| diff --git a/pc/peer_connection_integrationtest.cc b/pc/peer_connection_integrationtest.cc | ||
| index 19cc6ce3cfc8b8b38d45f5df9c28fe6dd01572f5..da8a53ef5d91c9c14dc6f42a10d176c7f6089ada 100644 | ||
| --- a/pc/peer_connection_integrationtest.cc | ||
| +++ b/pc/peer_connection_integrationtest.cc | ||
| @@ -1831,6 +1831,10 @@ TEST_P(PeerConnectionIntegrationTest, | ||
| EXPECT_EQ_WAIT(webrtc::PeerConnectionInterface::kIceConnectionConnected, | ||
| callee()->ice_connection_state(), kDefaultTimeout); | ||
|
|
||
| + // Part of reporting the stats will occur on the network thread, so flush it | ||
| + // before checking NumEvents. | ||
| + SendTask(network_thread(), [] {}); | ||
| + | ||
| EXPECT_METRIC_EQ(1, webrtc::metrics::NumEvents( | ||
| "WebRTC.PeerConnection.CandidatePairType_UDP", | ||
| webrtc::kIceCandidatePairHostNameHostName)); | ||
| @@ -1959,6 +1963,10 @@ TEST_P(PeerConnectionIntegrationIceStatesTest, MAYBE_VerifyBestConnection) { | ||
| EXPECT_EQ_WAIT(webrtc::PeerConnectionInterface::kIceConnectionConnected, | ||
| callee()->ice_connection_state(), kDefaultTimeout); | ||
|
|
||
| + // Part of reporting the stats will occur on the network thread, so flush it | ||
| + // before checking NumEvents. | ||
| + SendTask(network_thread(), [] {}); | ||
| + | ||
| // TODO(bugs.webrtc.org/9456): Fix it. | ||
| const int num_best_ipv4 = webrtc::metrics::NumEvents( | ||
| "WebRTC.PeerConnection.IPMetrics", webrtc::kBestConnections_IPv4); |