Revert "Merge pull request intel#146 from dawagner/criterion-overflow-check"

This reverts commit 12227ef, reversing
changes made to 1f14d4b.

Author: dawagner

parameter/SelectionCriterionType.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015, Intel Corporation
+ * Copyright (c) 2011-2014, Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -30,8 +30,6 @@
 #include "SelectionCriterionType.h"
 #include "Tokenizer.h"
 
-#include <climits>
-
 #define base CElement
 
 const std::string CSelectionCriterionType::_strDelimiter = "|";
@@ -53,18 +51,6 @@ std::string CSelectionCriterionType::getKind() const
 // From ISelectionCriterionTypeInterface
 bool CSelectionCriterionType::addValuePair(int iValue, const std::string& strValue)
 {
-    // An inclusive criterion is implemented as a bitfield over an int and
-    // thus, can't have values larger than the number of bits in an int.
-    static const unsigned int inclusiveCriterionMaxValue = 1 << (sizeof(iValue) * CHAR_BIT - 1);
-
-    if (_bInclusive && (unsigned int)iValue > inclusiveCriterionMaxValue) {
-
-        log_warning("Rejecting value pair association: 0x%X - %s "
-                    "because an inclusive criterion can't have values larger than 0x%X",
-                    iValue, strValue.c_str(), inclusiveCriterionMaxValue);
-        return false;
-    }
-
     // Check 1 bit set only for inclusive types
     if (_bInclusive && (!iValue || (iValue & (iValue - 1)))) {
 

test/test-platform/TestPlatform.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015, Intel Corporation
+ * Copyright (c) 2011-2014, Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -333,6 +333,14 @@ bool CTestPlatform::createInclusiveSelectionCriterionFromStateList(
     assert(pCriterionType != NULL);
 
     uint32_t uiNbStates = remoteCommand.getArgumentCount() - 1;
+
+    if (uiNbStates > 32) {
+
+        strResult = "Maximum number of states for inclusive criterion is 32";
+
+        return false;
+    }
+
     uint32_t uiState;
 
     for (uiState = 0; uiState < uiNbStates; uiState++) {
@@ -389,6 +397,13 @@ bool CTestPlatform::createInclusiveSelectionCriterion(const string& strName,
     ISelectionCriterionTypeInterface* pCriterionType =
         _pParameterMgrPlatformConnector->createSelectionCriterionType(true);
 
+    if (uiNbStates > 32) {
+
+        strResult = "Maximum number of states for inclusive criterion is 32";
+
+        return false;
+    }
+
     uint32_t uiState;
 
     for (uiState = 0; uiState < uiNbStates; uiState++) {