@@ -135,7 +135,7 @@ static void handler_execute(esp_event_loop_instance_t* loop, esp_event_handler_n
135135
136136 (* (handler -> handler_ctx -> handler ))(handler -> handler_ctx -> arg , post .base , post .id , data_ptr );
137137#else
138- (* (handler -> handler_ctx -> handler ))(handler -> handler_ctx -> arg , post .base , post .id , post .data );
138+ (* (handler -> handler_ctx -> handler ))(handler -> handler_ctx -> arg , post .base , post .id , post .data . ptr );
139139#endif
140140
141141#ifdef CONFIG_ESP_EVENT_LOOP_PROFILING
@@ -429,14 +429,11 @@ static void loop_node_remove_all_handler(esp_event_loop_node_t* loop_node)
429429static void inline __attribute__((always_inline )) post_instance_delete (esp_event_post_instance_t * post )
430430{
431431#if CONFIG_ESP_EVENT_POST_FROM_ISR
432- if (post -> data_allocated && post -> data .ptr ) {
432+ if (post -> data_allocated )
433+ #endif
434+ {
433435 free (post -> data .ptr );
434436 }
435- #else
436- if (post -> data ) {
437- free (post -> data );
438- }
439- #endif
440437 memset (post , 0 , sizeof (* post ));
441438}
442439
@@ -935,12 +932,10 @@ esp_err_t esp_event_post_to(esp_event_loop_handle_t event_loop, esp_event_base_t
935932 }
936933
937934 memcpy (event_data_copy , event_data , event_data_size );
938- #if CONFIG_ESP_EVENT_POST_FROM_ISR
939935 post .data .ptr = event_data_copy ;
936+ #if CONFIG_ESP_EVENT_POST_FROM_ISR
940937 post .data_allocated = true;
941938 post .data_set = true;
942- #else
943- post .data = event_data_copy ;
944939#endif
945940 }
946941 post .base = event_base ;
0 commit comments