diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2016-03-16 14:09:07 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-11 11:15:06 +0200 |
| commit | dd46d3a0df188f2e8229a9247b876736155d6ce7 (patch) | |
| tree | 9084c426e8caa150866cfedb7fec7704c81ed20a | |
| parent | 059bb67ad2b103de058f7e6031f21c6b1647992e (diff) | |
| download | qtwebengine-chromium-dd46d3a0df188f2e8229a9247b876736155d6ce7.tar.gz | |
Fix access to potentially uninitialized member in RenderThreadImpl
A call to reset the compositor thread in blink_platform_impl_
was added to Chromium in January 2016, just before we updated the
snapshot.
This seems to be present in upstream Chromium still, the fix will
be submitted there as well.
Change-Id: I6075242f8af79d6a8cd03f6cb8b5852175b4a4b0
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
| -rw-r--r-- | chromium/content/renderer/render_thread_impl.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/content/renderer/render_thread_impl.cc b/chromium/content/renderer/render_thread_impl.cc index 0e3dcdc072d..9473a49b7a5 100644 --- a/chromium/content/renderer/render_thread_impl.cc +++ b/chromium/content/renderer/render_thread_impl.cc @@ -907,7 +907,8 @@ void RenderThreadImpl::Shutdown() { media_thread_.reset(); - blink_platform_impl_->SetCompositorThread(nullptr); + if (blink_platform_impl_) + blink_platform_impl_->SetCompositorThread(nullptr); compositor_thread_.reset(); @@ -2062,7 +2063,8 @@ RenderThreadImpl::SharedWorkerContextProvider() { } void RenderThreadImpl::SampleGamepads(blink::WebGamepads* data) { - blink_platform_impl_->sampleGamepads(*data); + if (blink_platform_impl_) + blink_platform_impl_->sampleGamepads(*data); } bool RenderThreadImpl::RendererIsHidden() const { |