diff options
author | Brad King <brad.king@kitware.com> | 2019-04-05 12:13:43 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-04-05 12:18:14 (GMT) |
commit | a9b38a17571bca0801594adf85fef59fac51d6ba (patch) | |
tree | 590dbf43ed1e15e7c654b3cd083f83e83dfb1381 | |
parent | 2024327746747989f47dec3859e2ca4bc66267c3 (diff) | |
download | CMake-a9b38a17571bca0801594adf85fef59fac51d6ba.zip CMake-a9b38a17571bca0801594adf85fef59fac51d6ba.tar.gz CMake-a9b38a17571bca0801594adf85fef59fac51d6ba.tar.bz2 |
cmRST: Fix crash on empty markup block
-rw-r--r-- | Source/cmRST.cxx | 6 | ||||
-rw-r--r-- | Tests/CMakeLib/testRST.expect | 4 | ||||
-rw-r--r-- | Tests/CMakeLib/testRST.rst | 4 |
3 files changed, 14 insertions, 0 deletions
diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx index b7216b0..2064275 100644 --- a/Source/cmRST.cxx +++ b/Source/cmRST.cxx @@ -457,6 +457,12 @@ void cmRST::UnindentLines(std::vector<std::string>& lines) size_t trailingEmpty = std::distance(rit, cmFindNot(cmReverseRange(lines), std::string())); + if ((leadingEmpty + trailingEmpty) >= lines.size()) { + // All lines are empty. The markup block is empty. Leave only one. + lines.resize(1); + return; + } + std::vector<std::string>::iterator contentEnd = cmRotate( lines.begin(), lines.begin() + leadingEmpty, lines.end() - trailingEmpty); lines.erase(contentEnd, lines.end()); diff --git a/Tests/CMakeLib/testRST.expect b/Tests/CMakeLib/testRST.expect index d7b91d1..c19ee94 100644 --- a/Tests/CMakeLib/testRST.expect +++ b/Tests/CMakeLib/testRST.expect @@ -83,6 +83,10 @@ or after a paragraph ending in two colons:: but not after a line ending in two colons:: in the middle of a paragraph. +A literal block can be empty:: + + + .. productionlist:: grammar: `production` production: "content rendered" diff --git a/Tests/CMakeLib/testRST.rst b/Tests/CMakeLib/testRST.rst index 633219f..d2d1140 100644 --- a/Tests/CMakeLib/testRST.rst +++ b/Tests/CMakeLib/testRST.rst @@ -90,6 +90,10 @@ or after a paragraph ending in two colons:: but not after a line ending in two colons:: in the middle of a paragraph. +A literal block can be empty:: + + + .. productionlist:: grammar: `production` production: "content rendered" |