Commit 555f606c authored by Mark Brand's avatar Mark Brand Committed by Commit Bot

Add missing checks for parameter validity in VideoCaptureHost.

Bug: 1133812
Change-Id: I32e8fafc3c4a190a5b1f6be905bf2f1f829b473f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2503556Reviewed-by: default avatarGuido Urdaneta <guidou@chromium.org>
Commit-Queue: Mark Brand <markbrand@google.com>
Cr-Commit-Position: refs/heads/master@{#826248}
parent 4baf95f6
...@@ -191,6 +191,11 @@ void VideoCaptureHost::Start( ...@@ -191,6 +191,11 @@ void VideoCaptureHost::Start(
<< media::VideoCaptureFormat::ToString(params.requested_format); << media::VideoCaptureFormat::ToString(params.requested_format);
DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (!params.IsValid()) {
mojo::ReportBadMessage("Invalid video capture params.");
return;
}
DCHECK(!base::Contains(device_id_to_observer_map_, device_id)); DCHECK(!base::Contains(device_id_to_observer_map_, device_id));
device_id_to_observer_map_[device_id].Bind(std::move(observer)); device_id_to_observer_map_[device_id].Bind(std::move(observer));
...@@ -248,6 +253,11 @@ void VideoCaptureHost::Resume(const base::UnguessableToken& device_id, ...@@ -248,6 +253,11 @@ void VideoCaptureHost::Resume(const base::UnguessableToken& device_id,
DVLOG(1) << __func__ << " " << device_id; DVLOG(1) << __func__ << " " << device_id;
DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (!params.IsValid()) {
mojo::ReportBadMessage("Invalid video capture params.");
return;
}
VideoCaptureControllerID controller_id(device_id); VideoCaptureControllerID controller_id(device_id);
auto it = controllers_.find(controller_id); auto it = controllers_.find(controller_id);
if (it == controllers_.end() || !it->second) if (it == controllers_.end() || !it->second)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment