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

Merge branch 'fix-long-char-1-3' into 'release/v1.3'

Browse Source 
[v1.3] components/esp-matter: fix len check for long char and do check for

See merge request app-frameworks/esp-matter!1125
This commit is contained in:
Hrishikesh Dhayagude
2025-05-02 18:06:13 +08:00
parent 9bf3106793 d04b09a2ed
commit 6232e912c8
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_matter/esp_matter_attribute_utils.cpp
+10 -3
View File
@@ -1306,7 +1306,7 @@ esp_err_t get_data_from_attr_val(esp_matter_attr_val_t *val, EmberAfAttributeTyp
string_len = strnlen((const char *)val->val.a.b, val->val.a.s); string_len = strnlen((const char *)val->val.a.b, val->val.a.s);
} }
size_t data_size_len = val->val.a.t - val->val.a.s; size_t data_size_len = val->val.a.t - val->val.a.s;
if (string_len >= UINT8_MAX || data_size_len != 2) { if (string_len >= UINT16_MAX || data_size_len != 2) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
uint16_t data_size = string_len; uint16_t data_size = string_len;
@@ -1982,12 +1982,19 @@ esp_err_t update(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_i
/* Get size */ /* Get size */
EmberAfAttributeType attribute_type = 0; EmberAfAttributeType attribute_type = 0;
uint16_t attribute_size = 0; uint16_t attribute_size = 0;
get_data_from_attr_val(val, &attribute_type, &attribute_size, NULL); esp_err_t err = get_data_from_attr_val(val, &attribute_type, &attribute_size, NULL);
if (err != ESP_OK) {
ESP_LOGE(TAG, "Error getting data from attribute value: %d", err);
if (lock_status == lock::SUCCESS) {
lock::chip_stack_unlock();
}
return err;
}
/* Get value */ /* Get value */
uint8_t *value = (uint8_t *)esp_matter_mem_calloc(1, attribute_size); uint8_t *value = (uint8_t *)esp_matter_mem_calloc(1, attribute_size);
if (!value) { if (!value) {
ESP_LOGE(TAG, "Could not allocate value buffer"); ESP_LOGE(TAG, "Could not allocate value buffer, size: %u", attribute_size);
if (lock_status == lock::SUCCESS) { if (lock_status == lock::SUCCESS) {
lock::chip_stack_unlock(); lock::chip_stack_unlock();
} }