diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-15 20:47:57 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-15 20:47:57 +0200 |
| commit | 82ea53ad24c92b345ac2b542a174887f5de5723a (patch) | |
| tree | 7d326274b52bbedac481be522a20732f77457073 /tests/auto/tools/qmakelib/parsertest.cpp | |
| parent | e46e112eb10850801218bd810ecaeb8fd29f4c34 (diff) | |
| parent | 178ab885626bcd67507fde7f67f65c1872ac3be3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
qmake/library/qmakeevaluator.cpp
One side changed the iterator to use ranged-for, the other changed its
body; they only conflicted because the latter had to add braces around
the body, intruding on the for-line. Trivial resolution.
Change-Id: Ib487bc3bd6e3c5225db15f94b9a8f6caaa33456b
Diffstat (limited to 'tests/auto/tools/qmakelib/parsertest.cpp')
| -rw-r--r-- | tests/auto/tools/qmakelib/parsertest.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/tools/qmakelib/parsertest.cpp b/tests/auto/tools/qmakelib/parsertest.cpp index 5f345617db..5e12d930f8 100644 --- a/tests/auto/tools/qmakelib/parsertest.cpp +++ b/tests/auto/tools/qmakelib/parsertest.cpp @@ -1867,6 +1867,13 @@ void tst_qmakelib::addParseAbuse() /* 24 */ /* else branch */ << I(0)) << "in:1: OR operator without prior condition." << false; + + // Token buffer overflow. Verify with Valgrind or asan. + QTest::newRow("QTCREATORBUG-16508") + << "a{b{c{d{" + << TS() + << "in:2: Missing closing brace(s)." + << false; } void tst_qmakelib::proParser_data() |