1 files changed, 36 insertions, 5 deletions

diff --git a/Source/cmListCommand.cxx b/Source/cmListCommand.cxx
index cbbcbb0..7848424 100644
--- a/Source/cmListCommand.cxx
+++ b/Source/cmListCommand.cxx
@@ -98,7 +98,7 @@ bool cmListCommand::GetList(std::vector<std::string>& list, const char* var)
     {
     return false;
     }
-  // if the size of the list 
+  // if the size of the list
   if(listString.size() == 0)
     {
     return true;
@@ -107,7 +107,7 @@ bool cmListCommand::GetList(std::vector<std::string>& list, const char* var)
   cmSystemTools::ExpandListArgument(listString, list, true);
   // check the list for empty values
   bool hasEmpty = false;
-  for(std::vector<std::string>::iterator i = list.begin(); 
+  for(std::vector<std::string>::iterator i = list.begin();
       i != list.end(); ++i)
     {
     if(i->size() == 0)
@@ -116,7 +116,7 @@ bool cmListCommand::GetList(std::vector<std::string>& list, const char* var)
       break;
       }
     }
-  // if no empty elements then just return 
+  // if no empty elements then just return
   if(!hasEmpty)
     {
     return true;
@@ -124,7 +124,7 @@ bool cmListCommand::GetList(std::vector<std::string>& list, const char* var)
   // if we have empty elements we need to check policy CMP0007
   switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0007))
     {
-    case cmPolicies::WARN: 
+    case cmPolicies::WARN:
       {
       // Default is to warn and use old behavior
       // OLD behavior is to allow compatibility, so recall
@@ -204,6 +204,12 @@ bool cmListCommand::HandleGetCommand(std::vector<std::string> const& args)
     this->Makefile->AddDefinition(variableName.c_str(), "NOTFOUND");
     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;
   size_t cc;
@@ -318,7 +324,8 @@ bool cmListCommand::HandleInsertCommand(std::vector<std::string> const& args)
   // expand the variable
   int item = atoi(args[2].c_str());
   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;
     str << "index: " << item << " out of range (0, 0)";
@@ -422,6 +429,12 @@ bool cmListCommand
     this->SetError("sub-command REVERSE requires a list as an argument.");
     return false;
     }
+  else if(args.size() > 2)
+    {
+    this->SetError(
+      "sub-command REVERSE only takes one argument.");
+    return false;
+    }
 
   const std::string& listName = args[1];
   // expand the variable
@@ -456,6 +469,12 @@ bool cmListCommand
       "sub-command REMOVE_DUPLICATES requires a list as an argument.");
     return false;
     }
+  else if(args.size() > 2)
+    {
+    this->SetError(
+      "sub-command REMOVE_DUPLICATES only takes one argument.");
+    return false;
+    }
 
   const std::string& listName = args[1];
   // expand the variable
@@ -499,6 +518,12 @@ bool cmListCommand
     this->SetError("sub-command SORT requires a list as an argument.");
     return false;
     }
+  else if(args.size() > 2)
+    {
+    this->SetError(
+      "sub-command SORT only takes one argument.");
+    return false;
+    }
 
   const std::string& listName = args[1];
   // expand the variable
@@ -544,6 +569,12 @@ bool cmListCommand::HandleRemoveAtCommand(
     this->SetError("sub-command REMOVE_AT requires list to be present.");
     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;
   std::vector<size_t> removed;