admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid container-overflow in WgcCaptureSession::GetFrame

Browse Source 
ASAN is throwing a container-overflow because we are accessing a region
in the vector that is valid but does not have an element. We can avoid
this by using resize instead of reserve.

See the documentation for container-overflow for more details:
https://github.com/google/sanitizers/wiki/AddressSanitizerContainerOverflow#:~:text=One%20kind%20of%20bugs%20that%20AddressSanitizer%20can%20find,outside%20of%20the%20current%20container%20bounds.%20Simplest%20example%3A

Bug: webrtc:13541
Change-Id: Id11def90ef8c2cfec9c20f38384547ce6c37b980
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/244861
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Commit-Queue: Austin Orion <auorion@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#35654}
This commit is contained in:
Austin Orion 2022-01-07 15:05:07 -08:00 committed by WebRTC LUCI CQ
parent b7fb538abb
commit 91f55e4dec
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/desktop_capture/win/wgc_capture_session.cc
View File

@ -290,7 +290,7 @@ HRESULT WgcCaptureSession::GetFrame(
// unmap our texture.
uint8_t* src_data = static_cast<uint8_t*>(map_info.pData);
std::vector<uint8_t> image_data;
image_data.reserve(image_height * row_data_length);
image_data.resize(image_height * row_data_length);
uint8_t* image_data_ptr = image_data.data();
for (int i = 0; i < image_height; i++) {
memcpy(image_data_ptr, src_data, row_data_length);