Review Request 126931: Fix crash when importing cmake tests whose arguments contain ')'
Kevin Funk
kfunk at kde.org
Tue Feb 2 20:06:07 UTC 2016
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/126931/#review91989
-----------------------------------------------------------
Could you integrate that to the test suite in kdevelop.git?
Have a look at: kdevelop.git:projectmanagers/cmake/tests/test_cmakemanager.cpp -- just add another test function there
- Kevin Funk
On Feb. 1, 2016, 4:01 p.m., Andrew Coles wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/126931/
> -----------------------------------------------------------
>
> (Updated Feb. 1, 2016, 4:01 p.m.)
>
>
> Review request for KDevelop.
>
>
> Bugs: 358454
> http://bugs.kde.org/show_bug.cgi?id=358454
>
>
> Repository: kdevelop
>
>
> Description
> -------
>
> In projectmanagers/cmake/cmakeimportjsonjob.cpp, there's a regular expression that matches 'add_test' lines from CTestTestfile.cmake files, but it stops reading at the first ) character:
>
> `const QRegularExpression rx("add_test *\((.+?) (.*?)\)");`
>
> If the argument list for the add_test line contains brackets, for instance:
>
> add_test(some-test "/some/path" "(foo)" "bar")
>
> ...then this causes a segfault a few lines further down - the second rx capture is not a well-formed argument list.
>
> This patch changes the regexp to only stop when ) is at the end of the line:
>
> `const QRegularExpression rx("add_test *\((.+?) (.*?)\) *$");`
>
> It also allows for spaces between the ')' and the end of the line, to be consistent with allowing extra spacing earlier on after add_test. I'm not sure if this matters in practice but is harmless enough.
>
>
> Diffs
> -----
>
> projectmanagers/cmake/cmakeimportjsonjob.cpp 0502be7
>
> Diff: https://git.reviewboard.kde.org/r/126931/diff/
>
>
> Testing
> -------
>
> It can now import CTestTestfile.cmake files from my projects without crashing. I haven't tested it with other people's cmake build trees.
>
>
> File Attachments
> ----------------
>
> This will cause a seg fault in importTestSuites
> https://git.reviewboard.kde.org/media/uploaded/files/2016/02/01/e3bfaea9-27e8-4d39-881b-aaf493981d30__CTestTestfile.cmake
>
>
> Thanks,
>
> Andrew Coles
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20160202/3fbfab25/attachment.html>
More information about the KDevelop-devel
mailing list