From 11d0f7827fa8b20c7a084a184e70b90e1e0aeaea Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 23 Apr 2012 16:47:50 +0200 Subject: [PATCH] Don't use the QRegExp methods that modify the object QRegExp matching methods modify the object, which we don't want to. In particular, when we receive a QRegExp from the user or we store in a context that might require thread-safety, make sure we make a copy before using it. QRegularExpression has no such shortcoming. Task-number: QTBUG-25064 Change-Id: I252d1c47d7039caacec6aac5b572371d5b7efe32 Reviewed-by: Giuseppe D'Angelo Reviewed-by: Lars Knoll --- src/quick/items/qquickdroparea.cpp | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp index 51ba4c5..053a133 100644 --- a/src/quick/items/qquickdroparea.cpp +++ b/src/quick/items/qquickdroparea.cpp @@ -230,8 +230,9 @@ bool QQuickDropAreaPrivate::hasMatchingKey(const QStringList &keys) const if (keyRegExp.isEmpty()) return true; + QRegExp copy = keyRegExp; foreach (const QString &key, keys) { - if (keyRegExp.exactMatch(key)) + if (copy.exactMatch(key)) return true; } return false; -- 1.7.2.5