diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2012-06-21 17:21:07 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-21 09:58:56 +0200 |
| commit | b89c6459d760e68c629c0d318d2afd494a2a415a (patch) | |
| tree | 63397a3e5aae9261dc0c80f5488d66661aef950c /src/quick/util | |
| parent | 73e0e7cd53d2ce457d2cab02895eb253902c555a (diff) | |
Fix crash in QQuickPixmapData::release()
Previously, if the reader was deleted (eg, via engine destruction)
the reply might be deleted without letting the associated
QQuickPixmapData know about it. If that data was later released,
it would attempt to write to previously freed memory.
This commit ensures that the data's reply ptr is set to zero when
the reply is deleted by the reader dtor. It also adds a comment to
the reply dtor to explain why it is important.
A unit test for this issue already exists:
tst_qquickpixmapcache::lockingCrash() run under valgrind.
Change-Id: Icd94528e1336db1c00b118b3f6d1222eef402c46
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index 3b9c59e5e3..592def19a9 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -374,6 +374,8 @@ QQuickPixmapReader::~QQuickPixmapReader() mutex.lock(); // manually cancel all outstanding jobs. foreach (QQuickPixmapReply *reply, jobs) { + if (reply->data && reply->data->reply == reply) + reply->data->reply = 0; delete reply; } jobs.clear(); @@ -838,6 +840,8 @@ QQuickPixmapReply::QQuickPixmapReply(QQuickPixmapData *d) QQuickPixmapReply::~QQuickPixmapReply() { + // note: this->data->reply must be set to zero if this->data->reply == this + // but it must be done within mutex locking, to be guaranteed to be safe. } bool QQuickPixmapReply::event(QEvent *event) |