zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dangling pointers issue in LibvpxVp8Encoder::Encode()

Browse Source 
LibvpxVp8Encoder::Encode() creates a local instance of
rtc::scoped_refptr<I420BufferInterface>, then sets members to
point into the internal state of that I420BufferInterface. These
pointers remain in place after the buffer is destroyed.

This CL fixes the issue by deleting the references when the
function exits.

Bug: webrtc:10570
Change-Id: I9623e2ff3dd43e8fd1d1cc7696a3f28227d4544b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133882
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Elad Alon <eladalon@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27738}
This commit is contained in:
Elad Alon
2019-04-24 11:41:32 +02:00
committed by Commit Bot
parent 84ae2b6efd
commit 9a86275860
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/video_coding/codecs/vp8/libvpx_vp8_encoder.cc
View File

@ -922,6 +922,16 @@ int LibvpxVp8Encoder::Encode(const VideoFrame& frame,
raw_images_[0].stride[VPX_PLANE_U] = input_image->StrideU();
raw_images_[0].stride[VPX_PLANE_V] = input_image->StrideV();
struct CleanUpOnExit {
explicit CleanUpOnExit(vpx_image_t& raw_image) : raw_image_(raw_image) {}
~CleanUpOnExit() {
raw_image_.planes[VPX_PLANE_Y] = nullptr;
raw_image_.planes[VPX_PLANE_U] = nullptr;
raw_image_.planes[VPX_PLANE_V] = nullptr;
}
vpx_image_t& raw_image_;
} clean_up_on_exit(raw_images_[0]);
for (size_t i = 1; i < encoders_.size(); ++i) {
// Scale the image down a number of times by downsampling factor
libyuv::I420Scale(