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

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
commit 9c8dfa4ba4
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit a90d8e46b87ea026182b97d8311dafc15c577714
Subproject commit aef55bbf636ed580d4d6408a5c2e75d1f70a875e

View File

@ -129,7 +129,7 @@ void _esp_error_check_failed_without_abort(esp_err_t rc, const char *file, int l
* serial output.
* 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) ({ \
esp_err_t __err_rc = (x); \
__err_rc; \