list: Handle errors on empty lists more gracefully (#13138)

Since commit ed1ea24c (Fix INSERT to allow inserting to empty list,
2006-05-15) the list command allows insertion into an empty list at
index 0.  Fix rejection of insertion at non-zero (negative) indices to
present an error message instead of crashing.

While at it, fix the error message of the GET and REMOVE_AT operations
when the list is empty to not present a bogus allowed range.

Add a "RunCMake.list" test to cover failure cases on empty lists.
This commit is contained in:
Brad King 2012-04-17 10:32:46 -04:00
parent 3f29f755c7
commit 05604eb9cb
13 changed files with 44 additions and 1 deletions

View File

@ -204,6 +204,12 @@ bool cmListCommand::HandleGetCommand(std::vector<std::string> const& args)
this->Makefile->AddDefinition(variableName.c_str(), "NOTFOUND"); this->Makefile->AddDefinition(variableName.c_str(), "NOTFOUND");
return true; return true;
} }
// FIXME: Add policy to make non-existing lists an error like empty lists.
if(varArgsExpanded.empty())
{
this->SetError("GET given empty list");
return false;
}
std::string value; std::string value;
size_t cc; size_t cc;
@ -318,7 +324,8 @@ bool cmListCommand::HandleInsertCommand(std::vector<std::string> const& args)
// expand the variable // expand the variable
int item = atoi(args[2].c_str()); int item = atoi(args[2].c_str());
std::vector<std::string> varArgsExpanded; std::vector<std::string> varArgsExpanded;
if ( !this->GetList(varArgsExpanded, listName.c_str()) && item != 0) if((!this->GetList(varArgsExpanded, listName.c_str())
|| varArgsExpanded.empty()) && item != 0)
{ {
cmOStringStream str; cmOStringStream str;
str << "index: " << item << " out of range (0, 0)"; str << "index: " << item << " out of range (0, 0)";
@ -544,6 +551,12 @@ bool cmListCommand::HandleRemoveAtCommand(
this->SetError("sub-command REMOVE_AT requires list to be present."); this->SetError("sub-command REMOVE_AT requires list to be present.");
return false; return false;
} }
// FIXME: Add policy to make non-existing lists an error like empty lists.
if(varArgsExpanded.empty())
{
this->SetError("REMOVE_AT given empty list");
return false;
}
size_t cc; size_t cc;
std::vector<size_t> removed; std::vector<size_t> removed;

View File

@ -44,3 +44,4 @@ add_RunCMake_test(ObjectLibrary)
add_RunCMake_test(build_command) add_RunCMake_test(build_command)
add_RunCMake_test(find_package) add_RunCMake_test(find_package)
add_RunCMake_test(list)

View File

@ -0,0 +1,3 @@
cmake_minimum_required(VERSION 2.8)
project(${RunCMake_TEST} NONE)
include(${RunCMake_TEST}.cmake)

View File

@ -0,0 +1 @@
1

View File

@ -0,0 +1,4 @@
CMake Error at EmptyGet0.cmake:2 \(list\):
list GET given empty list
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)$

View File

@ -0,0 +1,2 @@
set(mylist "")
list(GET mylist 0 result)

View File

@ -0,0 +1 @@
1

View File

@ -0,0 +1,4 @@
CMake Error at EmptyInsert-1.cmake:2 \(list\):
list index: -1 out of range \(0, 0\)
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)$

View File

@ -0,0 +1,2 @@
set(mylist "")
list(INSERT mylist -1 x)

View File

@ -0,0 +1 @@
1

View File

@ -0,0 +1,4 @@
CMake Error at EmptyRemoveAt0.cmake:2 \(list\):
list REMOVE_AT given empty list
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)$

View File

@ -0,0 +1,2 @@
set(mylist "")
list(REMOVE_AT mylist 0)

View File

@ -0,0 +1,5 @@
include(RunCMake)
run_cmake(EmptyGet0)
run_cmake(EmptyRemoveAt0)
run_cmake(EmptyInsert-1)