From 01ee897dc5395f7e0c121f6c8532ebb3d7f1344e Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 12 Apr 2018 11:52:30 +0200
Subject: [PATCH] Protect against null adapter client
Task-number: QTBUG-67653
Change-Id: I07c9dca788ee31f691b05f7647ffbf3f9e0b7260
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
---
src/core/render_widget_host_view_qt.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 8bbf6d3d7..66d9b819e 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -704,8 +704,11 @@ void RenderWidgetHostViewQt::ImeCompositionRangeChanged(const gfx::Range&, const
void RenderWidgetHostViewQt::RenderProcessGone(base::TerminationStatus terminationStatus,
int exitCode)
{
- m_adapterClient->renderProcessTerminated(
- m_adapterClient->renderProcessExitStatus(terminationStatus), exitCode);
+ if (m_adapterClient) {
+ m_adapterClient->renderProcessTerminated(
+ m_adapterClient->renderProcessExitStatus(terminationStatus),
+ exitCode);
+ }
Destroy();
}
@@ -716,7 +719,8 @@ void RenderWidgetHostViewQt::Destroy()
void RenderWidgetHostViewQt::SetTooltipText(const base::string16 &tooltip_text)
{
- m_adapterClient->setToolTip(toQt(tooltip_text));
+ if (m_adapterClient)
+ m_adapterClient->setToolTip(toQt(tooltip_text));
}
bool RenderWidgetHostViewQt::HasAcceleratedSurface(const gfx::Size&)
--
GitLab