diff options
| author | Josh Faust <jfaust@suitabletech.com> | 2013-04-23 21:36:30 -0700 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-14 06:52:01 +0000 |
| commit | 5adfb4063a64aa3ae27269330c1fb8960dda4082 (patch) | |
| tree | e48ce9ceb59046475ec54f047a54c3ec49aa5fd8 | |
| parent | 46468c4762b7e5fc4a69b6560af78a926b651554 (diff) | |
Fix QQmlTypeLoader::Blob::qmldirDataAvailable memory overwrite
An invalid iterator was being dereferenced.
Task-number: QTBUG-59268
Change-Id: I58635667ab4591c06f1d7644243b83fd0172e74f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 3004fd2196..6465cd0b19 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -1527,7 +1527,8 @@ bool QQmlTypeLoader::Blob::qmldirDataAvailable(QQmlQmldirData *data, QList<QQmlE return false; } - *it = priority; + if (it != m_unresolvedImports.end()) + *it = priority; return true; } } |