summaryrefslogtreecommitdiffstats
path: root/src/tools/uic/cpp/cppwriteinitialization.cpp
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2017-06-02 11:28:31 +0200
committerJarek Kobus <jaroslaw.kobus@qt.io>2017-06-13 06:56:10 +0000
commit73f8b605e3354f1ab85f36c8d20bdf0de2b1f74e (patch)
treebfa09455952fbc3f92e3da0b9a4d27cb4ca47b1a /src/tools/uic/cpp/cppwriteinitialization.cpp
parent3e1a7251b4c1878b7be79ab2ea6eed3421d16a9d (diff)
uic: Fix possible crash when reading the size hint property
It may crash on (probably a bit broken) qtbase/src/printsupport/dialogs/qpagesetupwidget.ui Change-Id: Ibca95a3d8aa4899adbc952aee7b46621ac888c6a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index bbef010a9c..d208ec6718 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -84,9 +84,10 @@ namespace {
int w = 0;
int h = 0;
if (properties.contains(QLatin1String("sizeHint"))) {
- const DomSize *sizeHint = properties.value(QLatin1String("sizeHint"))->elementSize();
- w = sizeHint->elementWidth();
- h = sizeHint->elementHeight();
+ if (const DomSize *sizeHint = properties.value(QLatin1String("sizeHint"))->elementSize()) {
+ w = sizeHint->elementWidth();
+ h = sizeHint->elementHeight();
+ }
}
output << w << ", " << h << ", ";