From d94bb1f6795302ef6eec795dd3ad92d60bd2aa4d Mon Sep 17 00:00:00 2001
From: Nick Shaforostov <mshaforostov@airmusictech.com>
Date: Wed, 8 May 2019 11:54:00 +0200
Subject: Flickable: add nullptr check (crash seen only in release mode on
 windows)

Change-Id: I2ac42ded0c2ed4dc3937a57f69109f10b19f9cc7
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 src/quick/items/qquickflickable.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/quick')

diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 52f7c29aa4..445fa0215b 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -1909,6 +1909,9 @@ void QQuickFlickable::cancelFlick()
 
 void QQuickFlickablePrivate::data_append(QQmlListProperty<QObject> *prop, QObject *o)
 {
+    if (!prop || !prop->data)
+        return;
+
     if (QQuickItem *i = qmlobject_cast<QQuickItem *>(o)) {
         i->setParentItem(static_cast<QQuickFlickablePrivate*>(prop->data)->contentItem);
     } else if (QQuickPointerHandler *pointerHandler = qmlobject_cast<QQuickPointerHandler *>(o)) {
-- 
cgit v1.2.3