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

esp_matter_attribute: Fix attribute values for uint16 and strings

Browse Source 
This includes all the attributes other than uint8.
Using memcpy instead of just setting the pointers.
Also allocating and freeing the buffers for arrays and strings.
This commit is contained in:
Chirag Atal
2022-03-07 13:25:11 +05:30
parent e2ea96ee14
commit ce9b734d56
5 changed files with 353 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/esp_matter_core.cpp
+31 -2
View File
@@ -595,7 +595,28 @@ esp_err_t esp_matter_attribute_set_val(esp_matter_attribute_t *attribute, esp_ma
return ESP_FAIL;
}
_esp_matter_attribute_t *current_attribute = (_esp_matter_attribute_t *)attribute;
current_attribute->val = val;
if (val.type == ESP_MATTER_VAL_TYPE_CHAR_STRING || val.type == ESP_MATTER_VAL_TYPE_OCTET_STRING
|| val.type == ESP_MATTER_VAL_TYPE_ARRAY) {
/* Free old buf */
if (current_attribute->val.val.a.b) {
free(current_attribute->val.val.a.b);
}
if (val.val.a.s > 0) {
/* Alloc new buf */
uint8_t *new_buf = (uint8_t *)calloc(1, val.val.a.s);
if (!new_buf) {
ESP_LOGE(TAG, "Could not allocate new buffer");
return ESP_ERR_NO_MEM;
}
/* Copy to new buf and assign */
memcpy(new_buf, val.val.a.b, val.val.a.s);
val.val.a.b = new_buf;
} else {
ESP_LOGI(TAG, "Set val called with string with size 0");
val.val.a.b = NULL;
}
}
memcpy((void *)&current_attribute->val, (void *)&val, sizeof(esp_matter_attr_val_t));
return ESP_OK;
}
@@ -645,6 +666,14 @@ static esp_err_t esp_matter_attribute_delete(esp_matter_attribute_t *attribute)
_esp_matter_attribute_t *current_attribute = (_esp_matter_attribute_t *)attribute;
/* Delete val here, if required */
if (current_attribute->val.type == ESP_MATTER_VAL_TYPE_CHAR_STRING
|| current_attribute->val.type == ESP_MATTER_VAL_TYPE_OCTET_STRING
|| current_attribute->val.type == ESP_MATTER_VAL_TYPE_ARRAY) {
/* Free buf */
if (current_attribute->val.val.a.b) {
free(current_attribute->val.val.a.b);
}
}
/* Free */
free(current_attribute);
@@ -672,7 +701,7 @@ esp_matter_attribute_t *esp_matter_attribute_create(esp_matter_cluster_t *cluste
attribute->attribute_id = attribute_id;
attribute->flags = flags;
attribute->flags |= ESP_MATTER_ATTRIBUTE_FLAG_EXTERNAL_STORAGE;
attribute->val = val;
esp_matter_attribute_set_val((esp_matter_attribute_t *)attribute, val);
/* Add */
_esp_matter_attribute_t *previous_attribute = NULL;