ESP32: Lock Thread stack before calling GenericOpenThread::DoInit() (project-chip#33545)

wqx6 · web-flow · commit 174f2a0d6d30 · 2024-05-23T15:59:53.000Z
diff --git a/src/platform/ESP32/ThreadStackManagerImpl.cpp b/src/platform/ESP32/ThreadStackManagerImpl.cpp
@@ -52,8 +52,12 @@ ThreadStackManagerImpl ThreadStackManagerImpl::sInstance;
 
 CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack()
 {
+    CHIP_ERROR err = CHIP_NO_ERROR;
     openthread_init_stack();
-    return GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::DoInit(esp_openthread_get_instance());
+    _LockThreadStack();
+    err = GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::DoInit(esp_openthread_get_instance());
+    _UnlockThreadStack();
+    return err;
 }
 
 CHIP_ERROR ThreadStackManagerImpl::_StartThreadTask()

Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,12 @@ ThreadStackManagerImpl ThreadStackManagerImpl::sInstance;`
`52`	`52`
`53`	`53`	`CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack()`
`54`	`54`	`{`
	`55`	`+ CHIP_ERROR err = CHIP_NO_ERROR;`
`55`	`56`	`openthread_init_stack();`
`56`		`- return GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::DoInit(esp_openthread_get_instance());`
	`57`	`+ _LockThreadStack();`
	`58`	`+ err = GenericThreadStackManagerImpl_OpenThread<ThreadStackManagerImpl>::DoInit(esp_openthread_get_instance());`
	`59`	`+ _UnlockThreadStack();`
	`60`	`+ return err;`
`57`	`61`	`}`
`58`	`62`
`59`	`63`	`CHIP_ERROR ThreadStackManagerImpl::_StartThreadTask()`