1 files changed, 6 insertions, 0 deletions

diff --git a/firmware/thread.c b/firmware/thread.c
index ce9252ccc6..b687144f4f 100644
--- a/firmware/thread.c
+++ b/firmware/thread.c
@@ -39,6 +39,7 @@
 #ifdef RB_PROFILE
 #include <profile.h>
 #endif
+#include "core_alloc.h"
 #include "gcc_extensions.h"
 
 /****************************************************************************
@@ -1161,6 +1162,11 @@ void switch_thread(void)
      * to this call. */
     store_context(&thread->context);
 
+#ifdef DEBUG
+    /* Check core_ctx buflib integrity */
+    core_check_valid();
+#endif
+
     /* Check if the current thread stack is overflown */
     if (UNLIKELY(thread->stack[0] != DEADBEEF) && thread->stack_size > 0)
         thread_stkov(thread);