diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2012-05-19 20:59:49 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-23 10:00:44 (GMT) |
| commit | f2b8a1237fb5f27957ab3dc7c84335c1dea90ce7 (patch) | |
| tree | a6915fbf452c78c5987813f228e08560af901acb /src/corelib/tools | |
| parent | 3484489af72c0cad3fac28f7c8b953c32e6feb9a (diff) | |
| download | Qt-f2b8a1237fb5f27957ab3dc7c84335c1dea90ce7.zip Qt-f2b8a1237fb5f27957ab3dc7c84335c1dea90ce7.tar.gz Qt-f2b8a1237fb5f27957ab3dc7c84335c1dea90ce7.tar.bz2 | |
QRegExp: fix crash
Fixes a crash when invoking various QRegExp methods on an object
*before* doing any match. For instance fixes:
QRegExp re;
re.matchedLength(); // crash
Backport of commit 136c2bf18446f2bbe7052d638c29edbc0b8ef6bc from qtbase.
Task-number: QTBUG-23352
Change-Id: I9c239ff790a139c7820ef1aeced89d31320ae6b0
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 188cdb5..c0efa9f 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -3799,6 +3799,7 @@ static void invalidateEngine(QRegExpPrivate *priv) QRegExp::QRegExp() { priv = new QRegExpPrivate; + prepareEngine(priv); } /*! @@ -3814,6 +3815,7 @@ QRegExp::QRegExp() QRegExp::QRegExp(const QString &pattern, Qt::CaseSensitivity cs, PatternSyntax syntax) { priv = new QRegExpPrivate(QRegExpEngineKey(pattern, syntax, cs)); + prepareEngine(priv); } /*! |