Răsfoiți Sursa

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
Mahavir Jain 4 ani în urmă
părinte
comite
9c8dfa4ba4
2 a modificat fișierele cu 2 adăugiri și 2 ștergeri
  1. 1 1
      components/bt/host/nimble/nimble
  2. 1 1
      components/esp_common/include/esp_err.h

+ 1 - 1
components/bt/host/nimble/nimble

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

+ 1 - 1
components/esp_common/include/esp_err.h

@@ -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;                                                                   \