Merge branch 'bugfix/fix_nullptr_ref_esp_event_possibility' into 'master'

esp_event: fix possibility of null ptr dereference

See merge request espressif/esp-idf!6839
This commit is contained in:
Jiang Jiang Jian 2019-11-28 17:22:55 +08:00
commit c8f483034d

View file

@ -678,15 +678,15 @@ esp_err_t esp_event_handler_register_with(esp_event_loop_handle_t event_loop, es
(last_loop_node && !SLIST_EMPTY(&(last_loop_node->base_nodes)) && is_loop_level_handler)) {
loop_node = (esp_event_loop_node_t*) calloc(1, sizeof(*loop_node));
SLIST_INIT(&(loop_node->handlers));
SLIST_INIT(&(loop_node->base_nodes));
if (!loop_node) {
ESP_LOGE(TAG, "alloc for new loop node failed");
err = ESP_ERR_NO_MEM;
goto on_err;
}
SLIST_INIT(&(loop_node->handlers));
SLIST_INIT(&(loop_node->base_nodes));
err = loop_node_add_handler(loop_node, event_base, event_id, event_handler, event_handler_arg);
if (err == ESP_OK) {