Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/sntp_init_can_run_before_net_connection' into 'master'

Browse source 
lw_ip: Add to sys_arch_protect() a check that the mutex is created before use if not then creates it

Closes WIFI-1019

See merge request espressif/esp-idf!7495
This commit is contained in:
Jiang Jiang Jian 2020-02-15 13:14:09 +08:00
parent 7d39f435a3 565eee12a0
commit c012011c16
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/lwip/port/esp32/freertos/sys_arch.c
View file

@ -423,8 +423,10 @@ sys_thread_new(const char *name, lwip_thread_fn thread, void *arg, int stacksize
void
sys_init(void)
{
if (ERR_OK != sys_mutex_new(&g_lwip_protect_mutex)) {
ESP_LOGE(TAG, "sys_init: failed to init lwip protect mutex\n");
if (!g_lwip_protect_mutex) {
if (ERR_OK != sys_mutex_new(&g_lwip_protect_mutex)) {
ESP_LOGE(TAG, "sys_init: failed to init lwip protect mutex\n");
}
}
// Create the pthreads key for the per-thread semaphore storage
@ -465,6 +467,9 @@ sys_now(void)
sys_prot_t
sys_arch_protect(void)
{
if (unlikely(!g_lwip_protect_mutex)) {
sys_mutex_new(&g_lwip_protect_mutex);
}
sys_mutex_lock(&g_lwip_protect_mutex);
return (sys_prot_t) 1;
}