aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
diff options
context:
space:
mode:
authorAleksei Ilin <a.ilin@outlook.com>2017-08-08 12:44:42 +0200
committerShawn Rutledge <shawn.rutledge@qt.io>2017-08-15 12:50:07 +0000
commit3513995d8fde7f002977275463fcea1b86f4a693 (patch)
tree4a2e22ab83e6d57ecb5a2fe3381e1f7cd9e00d8a /src/quick/items
parent1b21b73e89942d567c90a17a3bf7a7ecae3de258 (diff)
Fix crash in QQuickAnimatedImage
Check d->_movie pointer before dereferencing Task-number: QTBUG-62380 Change-Id: I62314c7c0d4a7e41fa6f8c4629d16f30d6036156 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry-picked from fc3ecd2522deb3f6d8d48b66dbd89402e1ab4b53)
Diffstat (limited to 'src/quick/items')
-rw-r--r--src/quick/items/qquickanimatedimage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp
index adf460886a..a30d71dd1e 100644
--- a/src/quick/items/qquickanimatedimage.cpp
+++ b/src/quick/items/qquickanimatedimage.cpp
@@ -370,7 +370,7 @@ void QQuickAnimatedImage::movieRequestFinished()
}
#endif
- if (!d->_movie->isValid()) {
+ if (!d->_movie || !d->_movie->isValid()) {
qmlWarning(this) << "Error Reading Animated Image File " << d->url.toString();
delete d->_movie;
d->_movie = 0;