Take a size check outside of an inner loop.

2 files changed, 10 insertions, 10 deletions

diff --git a/Source/cmSetTargetPropertiesCommand.cxx b/Source/cmSetTargetPropertiesCommand.cxx
index aeb8077..9a7fab2 100644
--- a/Source/cmSetTargetPropertiesCommand.cxx
+++ b/Source/cmSetTargetPropertiesCommand.cxx
@@ -35,15 +35,15 @@ bool cmSetTargetPropertiesCommand
       doingFiles = false;
       // now loop through the rest of the arguments, new style
       ++j;
+      if (std::distance(j, args.end()) % 2 != 0)
+        {
+        this->SetError("called with incorrect number of arguments.");
+        return false;
+        }
       while (j != args.end())
         {
         propertyPairs.push_back(*j);
         ++j;
-        if(j == args.end())
-          {
-          this->SetError("called with incorrect number of arguments.");
-          return false;
-          }
         propertyPairs.push_back(*j);
         ++j;
         }
diff --git a/Source/cmSetTestsPropertiesCommand.cxx b/Source/cmSetTestsPropertiesCommand.cxx
index e66d13d..032c78e 100644
--- a/Source/cmSetTestsPropertiesCommand.cxx
+++ b/Source/cmSetTestsPropertiesCommand.cxx
@@ -36,15 +36,15 @@ bool cmSetTestsPropertiesCommand
       doingFiles = false;
       // now loop through the rest of the arguments, new style
       ++j;
+      if (std::distance(j, args.end()) % 2 != 0)
+        {
+        this->SetError("called with incorrect number of arguments.");
+        return false;
+        }
       while (j != args.end())
         {
         propertyPairs.push_back(*j);
         ++j;
-        if(j == args.end())
-          {
-          this->SetError("called with incorrect number of arguments.");
-          return false;
-          }
         propertyPairs.push_back(*j);
         ++j;
         }