feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

newlib locking: Fix bug w/ _lock_close not clearing semaphore handle

Browse Source
This commit is contained in:
Angus Gratton
2016-08-25 14:27:36 +08:00
parent e6bc527dfb
commit 96b9649aa4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/esp32/syscalls.c
View File

@@ -258,7 +258,7 @@ void IRAM_ATTR _lock_close(_lock_t *lock) {
configASSERT(xSemaphoreGetMutexHolder(h) == NULL); /* mutex should not be held */ configASSERT(xSemaphoreGetMutexHolder(h) == NULL); /* mutex should not be held */
#endif #endif
vSemaphoreDelete(h); vSemaphoreDelete(h);
h = NULL; *lock = 0;
} }
portEXIT_CRITICAL(&lock_init_spinlock); portEXIT_CRITICAL(&lock_init_spinlock);
} }
@@ -275,9 +275,9 @@ static int IRAM_ATTR lock_acquire_generic(_lock_t *lock, uint32_t delay, uint8_t
/* lazy initialise lock - might have had a static initializer in newlib (that we don't use), /* lazy initialise lock - might have had a static initializer in newlib (that we don't use),
or _lock_init might have been called before the scheduler was running... */ or _lock_init might have been called before the scheduler was running... */
lock_init_generic(lock, mutex_type); lock_init_generic(lock, mutex_type);
h = (xSemaphoreHandle)(*lock);
configASSERT(h != NULL);
} }
h = (xSemaphoreHandle)(*lock); /* re-check after lock_init_generic */
configASSERT(h != NULL);
BaseType_t success; BaseType_t success;
if (cpu_in_interrupt_context()) { if (cpu_in_interrupt_context()) {