diff options
author | Frederic Boisnard <fredericx.boisnard@intel.com> | 2012-03-21 14:47:00 +0100 |
---|---|---|
committer | David Wagner <david.wagner@intel.com> | 2014-02-12 17:03:10 +0100 |
commit | 8b01852701d50869318663f568270f977d93dbdf (patch) | |
tree | b26462e5ae9e3b7cb10a9ed0511da6c2a7e6cd75 /parameter/ParameterType.cpp | |
parent | 170f0a44b8309a954cd4802e85ac3dd6944a35fa (diff) | |
download | external_parameter-framework-8b01852701d50869318663f568270f977d93dbdf.zip external_parameter-framework-8b01852701d50869318663f568270f977d93dbdf.tar.gz external_parameter-framework-8b01852701d50869318663f568270f977d93dbdf.tar.bz2 |
PFW: overflow not detected for int parameters
BZ: 26285
The following errors were not detected by the PFW when setting parameters
of type (U)INT8, (U)INT16, (U)INT32:
- When setting a value out of the int32 range (ex: 999999999999999), the
strtol/strtoul functions return the value -1 which was then assumed correct
by the PFW. Now the errno value is checked to ensure that no range error
was encountered by strtol/strtoul.
- When the input string does not contain any digits, the strtol/strtoul
functions return 0 which was assumed correct by the PFW. Now the endptr
argument is checked to make sure that at least a part of the string was
parsed.
In any case an error message is displayed and the original value is not
updated.
Made the change compliant to 64-bit OSes.
Applied the same corrections to Enum and FixedPoint types.
Change-Id: I135538def791208a6eb6143444a3fc30337137e1
Orig-Change-Id: I1519dbf798228a9be579aaf612f456d5eb1b41b5
Signed-off-by: Frederic Boisnard <fredericx.boisnard@intel.com>
Reviewed-on: http://android.intel.com:8080/55443
Reviewed-by: Mendi, EduardoX <eduardox.mendi@intel.com>
Tested-by: Mendi, EduardoX <eduardox.mendi@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'parameter/ParameterType.cpp')
-rw-r--r-- | parameter/ParameterType.cpp | 63 |
1 files changed, 50 insertions, 13 deletions
diff --git a/parameter/ParameterType.cpp b/parameter/ParameterType.cpp index 7079a46..a271f73 100644 --- a/parameter/ParameterType.cpp +++ b/parameter/ParameterType.cpp @@ -97,7 +97,7 @@ void CParameterType::showProperties(string& strResult) const } // Scalar size - strResult += "Scalar size: " + toString(_uiSize) + " byte(s) \n"; + strResult += "Scalar size: " + toString(getSize()) + " byte(s) \n"; } // Default value handling (simulation only) @@ -118,40 +118,77 @@ CInstanceConfigurableElement* CParameterType::doInstantiate() const } } -// Sign extension +// Sign extension (32 bits) void CParameterType::signExtend(int32_t& iData) const { - uint32_t uiSizeInBits = _uiSize * 8; - uint32_t uiShift = 8 * sizeof(iData) - uiSizeInBits; + doSignExtend(iData); +} + +// Sign extension (64 bits) +void CParameterType::signExtend(int64_t& iData) const +{ + doSignExtend(iData); +} + +// Generic sign extension +template <typename type> +void CParameterType::doSignExtend(type& data) const +{ + uint32_t uiSizeInBits = getSize() * 8; + uint32_t uiShift = 8 * sizeof(data) - uiSizeInBits; if (uiShift) { - iData = (iData << uiShift) >> uiShift; + data = (data << uiShift) >> uiShift; } } -// Check data has no bit set outside available range -bool CParameterType::isEncodable(uint32_t uiData) const +// Check data has no bit set outside available range (32 bits) +bool CParameterType::isEncodable(uint32_t uiData, bool bIsSigned) const { - uint32_t uiSizeInBits = _uiSize * 8; + return doIsEncodable(uiData, bIsSigned); +} - if (uiSizeInBits == 8 * sizeof(uiData)) { +// Check data has no bit set outside available range (64 bits) +bool CParameterType::isEncodable(uint64_t uiData, bool bIsSigned) const +{ + return doIsEncodable(uiData, bIsSigned); +} +// Generic encodability check +template <typename type> +bool CParameterType::doIsEncodable(type data, bool bIsSigned) const +{ + if (getSize() == sizeof(data)) { + // Prevent inappropriate shifts return true; } - // Check high bits are clean - return !(uiData >> uiSizeInBits); + uint32_t uiShift = getSize() * 8; + + if (!bIsSigned) { + + // Check high bits are clean + return !(data >> uiShift); + + } else { + + // Negative value? + bool bIsValueExpectedNegative = (data & (1 << (uiShift - 1))) != 0; + + // Check high bits are clean + return bIsValueExpectedNegative ? !(~data >> uiShift) : !(data >> uiShift); + } } // Remove all bits set outside available range uint32_t CParameterType::makeEncodable(uint32_t uiData) const { - if (_uiSize == sizeof(uint32_t)) { + if (getSize() == sizeof(uint32_t)) { return uiData; } - uint32_t uiSizeInBits = _uiSize * 8; + uint32_t uiSizeInBits = getSize() * 8; uint32_t uiMask = (1 << uiSizeInBits) - 1; |