Skip to content

Commit 50f4378

Browse files
committed
Merge branch 'brigde-dev-create' into 'main'
components/esp_matter_bridge: add null checks after memory allocations See merge request app-frameworks/esp-matter!1234
2 parents 1f41719 + 83f5aec commit 50f4378

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

components/esp_matter_bridge/esp_matter_bridge.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,11 @@ device_t *create_device(node_t *node, uint16_t parent_endpoint_id, uint32_t devi
296296

297297
// Create bridged device
298298
device_t *dev = (device_t *)esp_matter_mem_calloc(1, sizeof(device_t));
299+
if (!dev) {
300+
ESP_LOGE(TAG, "Failed to allocate memory for bridged device");
301+
return NULL;
302+
}
303+
299304
dev->node = node;
300305
dev->persistent_info.parent_endpoint_id = parent_endpoint_id;
301306
bridged_node::config_t bridged_node_config;
@@ -358,6 +363,11 @@ device_t *resume_device(node_t *node, uint16_t device_endpoint_id, void *priv_da
358363
return NULL;
359364
}
360365
device_t *dev = (device_t *)esp_matter_mem_calloc(1, sizeof(device_t));
366+
if (!dev) {
367+
ESP_LOGE(TAG, "Failed to allocate memory for bridged device");
368+
return NULL;
369+
}
370+
361371
dev->node = node;
362372
dev->persistent_info = persistent_info;
363373
bridged_node::config_t bridged_node_config;

0 commit comments

Comments
 (0)