alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_timer_delete_crash' into 'master'

Browse Source 
Nimble: Add fix for crash in esp_timer deletion

Closes IDFCI-731

See merge request espressif/esp-idf!14316
This commit is contained in:
Mahavir Jain 2021-07-14 10:07:16 +00:00
commit 5270d8216b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/host/nimble/nimble

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

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

@ -132,7 +132,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_; \