espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_timer_delete_crash_v4.3' into 'release/v4.3'

Browse Source 
Nimble: Add fix for crash in esp_timer deletion (v4.3)

See merge request espressif/esp-idf!14364
This commit is contained in:
Mahavir Jain
2021-07-16 08:20:14 +00:00
parent 33f1ad2106 758fc73efe
commit 9c8dfa4ba4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/host/nimble/nimble

Submodule components/bt/host/nimble/nimble updated: a90d8e46b8...aef55bbf63

2
components/esp_common/include/esp_err.h
View File

@ -129,7 +129,7 @@ void _esp_error_check_failed_without_abort(esp_err_t rc, const char *file, int l
* serial output. * serial output.
* In comparison with ESP_ERROR_CHECK(), this prints the same error message but isn't terminating the program. * In comparison with ESP_ERROR_CHECK(), this prints the same error message but isn't terminating the program.
*/ */
#ifdef NDEBUG #if defined NDEBUG || defined CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT
#define ESP_ERROR_CHECK_WITHOUT_ABORT(x) ({ \ #define ESP_ERROR_CHECK_WITHOUT_ABORT(x) ({ \
esp_err_t __err_rc = (x); \ esp_err_t __err_rc = (x); \
__err_rc; \ __err_rc; \