From e11fe4290c7f0c4a876113e5e440db37ecd91bcc Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@qt.io>
Date: Fri, 8 Sep 2017 12:52:14 +0200
Subject: Fix double-free in QQmlTypePrivate for enum values

Reported by ASan.

Change-Id: I8e5e6561e6e721ba7fe37a4658480d14b8c437ae
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/qml/qml/qqmlmetatype.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index 9bc35b3b52..bddbda5832 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -815,10 +815,10 @@ void QQmlTypePrivate::insertEnumsFromPropertyCache(const QQmlPropertyCache *cach
     const QMetaObject *cppMetaObject = cache->firstCppMetaObject();
 
     while (cache && cache->metaObject() != cppMetaObject) {
-        QStringHash<int> *scoped = new QStringHash<int>();
 
         int count = cache->qmlEnumCount();
         for (int ii = 0; ii < count; ++ii) {
+            QStringHash<int> *scoped = new QStringHash<int>();
             QQmlEnumData *enumData = cache->qmlEnum(ii);
 
             for (int jj = 0; jj < enumData->values.count(); ++jj) {
-- 
cgit v1.2.3