From 65ee566183d4afe59c92ddcc846ec0588c81c39a Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 6 May 2014 00:04:22 +0300
Subject: [PATCH] ManhattanStyle: Validate widget before dereferencing
Change-Id: Id32e59f96ed8a94f08eb0effbca4918e11659c06
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/coreplugin/manhattanstyle.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/plugins/coreplugin/manhattanstyle.cpp b/src/plugins/coreplugin/manhattanstyle.cpp
index 39c2615df72..995eee475f8 100644
--- a/src/plugins/coreplugin/manhattanstyle.cpp
+++ b/src/plugins/coreplugin/manhattanstyle.cpp
@@ -789,11 +789,12 @@ void ManhattanStyle::drawControl(ControlElement element, const QStyleOption *opt
bool horizontal = option->state & State_Horizontal;
// Map offset for global window gradient
- QPoint offset = widget->window()->mapToGlobal(option->rect.topLeft()) -
- widget->mapToGlobal(option->rect.topLeft());
QRect gradientSpan;
- if (widget)
+ if (widget) {
+ QPoint offset = widget->window()->mapToGlobal(option->rect.topLeft()) -
+ widget->mapToGlobal(option->rect.topLeft());
gradientSpan = QRect(offset, widget->window()->size());
+ }
bool drawLightColored = lightColored(widget);
if (horizontal)
--
GitLab