github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: backport b52f7fb5933a from WebRTC. (#23045)

Browse Source 
[DirectX] Fix vector allocation for raw data handling.

std::vector::reserve has the effect to reserve space in memory but does
not affect the result of size(), which keeps on returning 0. If size is
0, however, data() might either return null or not [1].

This CL fixes the use of reserve() in favour of resize() which
effectively allocates the memory in the vector and updates its size.
This way size() returns a value bigger than 0 and data() returns a valid
pointer.

[1] https://en.cppreference.com/w/cpp/container/vector/data

Fixed: chromium:1059764
Change-Id: Ida3dbe643710c6895f09b9da87b0075b7d7b28df
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/170470
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Commit-Queue: Armando Miraglia <armax@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30836}
This commit is contained in:
Pedro Pontes
2020-04-14 14:30:34 +02:00
committed by GitHub
parent 18877923b3
commit 0f67fac1ad
3 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
patches/common/config.json
View File

@@ -9,5 +9,7 @@
"src/electron/patches/common/icu": "src/third_party/icu",
"src/electron/patches/common/webrtc": "src/third_party/webrtc",
"src/electron/patches/node": "src/third_party/electron_node"
}

1
patches/common/webrtc/.patches Normal file
View File

@@ -0,0 +1 @@
fix_vector_allocation_for_raw_data_handling.patch

36
patches/common/webrtc/fix_vector_allocation_for_raw_data_handling.patch Normal file
View File

@@ -0,0 +1,36 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Armando Miraglia <armax@webrtc.org>
Date: Mon, 16 Mar 2020 13:10:26 +0100
Subject: Fix vector allocation for raw data handling.
std::vector::reserve has the effect to reserve space in memory but does
not affect the result of size(), which keeps on returning 0. If size is
0, however, data() might either return null or not [1].
This CL fixes the use of reserve() in favour of resize() which
effectively allocates the memory in the vector and updates its size.
This way size() returns a value bigger than 0 and data() returns a valid
pointer.
[1] https://en.cppreference.com/w/cpp/container/vector/data
Fixed: chromium:1059764
Change-Id: Ida3dbe643710c6895f09b9da87b0075b7d7b28df
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/170470
Reviewed-by: Jamie Walch <jamiewalch@chromium.org>
Commit-Queue: Armando Miraglia <armax@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30836}
diff --git a/modules/desktop_capture/win/dxgi_output_duplicator.cc b/modules/desktop_capture/win/dxgi_output_duplicator.cc
index 70172c2ae3c6c765ee793208b9ac374fb6521589..e5bde24e996ab266461b3570d0576e1c23658f96 100644
--- a/modules/desktop_capture/win/dxgi_output_duplicator.cc
+++ b/modules/desktop_capture/win/dxgi_output_duplicator.cc
@@ -276,7 +276,7 @@ bool DxgiOutputDuplicator::DoDetectUpdatedRegion(
if (metadata_.capacity() < frame_info.TotalMetadataBufferSize) {
metadata_.clear(); // Avoid data copy
- metadata_.reserve(frame_info.TotalMetadataBufferSize);
+ metadata_.resize(frame_info.TotalMetadataBufferSize);
}
UINT buff_size = 0;