1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QRegExp: fix crash

Browse Source 
Fixes a crash when invoking various QRegExp methods on an object
*before* doing any match. For instance fixes:
  QRegExp re;
  re.matchedLength(); // crash

Task-number: QTBUG-23352
Change-Id: I9c239ff790a139c7820ef1aeced89d31320ae6b0
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Giuseppe D'Angelo 2012-02-26 01:45:53 +00:00 committed by Qt by Nokia
parent 568e714fdf
commit 136c2bf184
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qregexp.cpp
View File

@ -3934,6 +3934,7 @@ static void invalidateEngine(QRegExpPrivate *priv)
QRegExp::QRegExp() QRegExp::QRegExp()
{ {
priv = new QRegExpPrivate; priv = new QRegExpPrivate;
prepareEngine(priv);
} }
/*! /*!
@ -3949,6 +3950,7 @@ QRegExp::QRegExp()
QRegExp::QRegExp(const QString &pattern, Qt::CaseSensitivity cs, PatternSyntax syntax) QRegExp::QRegExp(const QString &pattern, Qt::CaseSensitivity cs, PatternSyntax syntax)
{ {
priv = new QRegExpPrivate(QRegExpEngineKey(pattern, syntax, cs)); priv = new QRegExpPrivate(QRegExpEngineKey(pattern, syntax, cs));
prepareEngine(priv);
} }
/*! /*!

29
tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
View File

@ -79,6 +79,8 @@ private slots:
void posAndCapConsistency_data(); void posAndCapConsistency_data();
void posAndCapConsistency(); void posAndCapConsistency();
void interval(); void interval();
void validityCheck_data();
void validityCheck();
}; };
// Testing get/set functions // Testing get/set functions
@ -1344,6 +1346,33 @@ void tst_QRegExp::interval()
} }
} }
void tst_QRegExp::validityCheck_data()
{
QTest::addColumn<QString>("pattern");
QTest::addColumn<bool>("validity");
QTest::newRow("validity01") << QString() << true;
QTest::newRow("validity02") << QString("abc.*abc") << true;
QTest::newRow("validity03") << QString("[a-z") << false;
QTest::newRow("validity04") << QString("a(b") << false;
}
void tst_QRegExp::validityCheck()
{
QFETCH(QString, pattern);
QRegExp rx(pattern);
QTEST(rx.isValid(), "validity");
QCOMPARE(rx.matchedLength(), -1);
QCOMPARE(rx.pos(), -1);
QCOMPARE(rx.cap(), QString(""));
QRegExp rx2(rx);
QTEST(rx2.isValid(), "validity");
QCOMPARE(rx2.matchedLength(), -1);
QCOMPARE(rx2.pos(), -1);
QCOMPARE(rx2.cap(), QString(""));
}
QTEST_APPLESS_MAIN(tst_QRegExp) QTEST_APPLESS_MAIN(tst_QRegExp)
#include "tst_qregexp.moc" #include "tst_qregexp.moc"