espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

esp_matter_attribute_utils: Fix crash for nullable attribute's assignment

Browse Source 
Removed the assert when the nullable attribute was being the actual null value. Handling this in the APIs now.
This commit is contained in:
Chirag Atal
2022-12-02 16:31:29 +05:30
parent 449160b1ed
commit 58a21b6146
1 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/esp_matter_attribute_utils.h
+39 -6
View File
@@ -153,12 +153,38 @@ typedef struct esp_matter_attr_bounds {
template <typename T>
class nullable {
/** NOTE: GetNullValue is taken from src/app/util/attribute-storage-null-handling.h */
private:
template <typename U = T, typename std::enable_if_t<std::is_floating_point<U>::value, int> = 0>
static constexpr T GetNullValue()
{
return std::numeric_limits<T>::quiet_NaN();
}
template <typename U = T, typename std::enable_if_t<std::is_integral<U>::value, int> = 0>
static constexpr T GetNullValue()
{
return std::is_signed<T>::value ? std::numeric_limits<T>::min() : std::numeric_limits<T>::max();
}
template <typename U = T, typename std::enable_if_t<std::is_enum<U>::value, int> = 0>
static constexpr T GetNullValue()
{
static_assert(!std::is_signed<std::underlying_type_t<T>>::value, "Enums must be unsigned");
return static_cast<T>(std::numeric_limits<std::underlying_type_t<T>>::max());
}
public:
nullable(T value)
{
assert(!chip::app::NumericAttributeTraits<T>::IsNullValue(value));
val = value;
if (chip::app::NumericAttributeTraits<T>::IsNullValue(value)) {
chip::app::NumericAttributeTraits<T>::SetNull(val);
} else {
val = value;
}
}
nullable()
{
chip::app::NumericAttributeTraits<T>::SetNull(val);
@@ -166,8 +192,12 @@ public:
T value()
{
assert(!is_null());
return val;
if (is_null()) {
return GetNullValue();
} else {
return val;
}
}
T value_or(T ret)
@@ -182,8 +212,11 @@ public:
void operator=(T value)
{
assert(!chip::app::NumericAttributeTraits<T>::IsNullValue(value));
this->val = value;
if (chip::app::NumericAttributeTraits<T>::IsNullValue(value)) {
chip::app::NumericAttributeTraits<T>::SetNull(this->val);
} else {
this->val = value;
}
}
void operator=(std::nullptr_t)