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

Merge branch 'bugfix/handle_issue_of_malloc_fail_v4.1' into 'release/v4.1'

Browse Source 
bugfix/avoid unexpected free when malloc failed (v4.1)

See merge request espressif/esp-idf!20724
This commit is contained in:
Wang Meng Yang
2022-10-26 18:57:32 +08:00
parent 8da39d82ca f738750ae6
commit e9ded8fdec
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/bt/common/osi/thread.c
View File

@@ -118,17 +118,17 @@ osi_thread_t *osi_thread_create(const char *name, size_t stack_size, int priorit
return NULL; return NULL;
} }
osi_thread_t *thread = (osi_thread_t *)osi_malloc(sizeof(osi_thread_t)); osi_thread_t *thread = (osi_thread_t *)osi_calloc(sizeof(osi_thread_t));
if (thread == NULL) { if (thread == NULL) {
goto _err; goto _err;
} }
thread->stop = false; thread->stop = false;
thread->work_queue_num = work_queue_num; thread->work_queues = (fixed_queue_t **)osi_calloc(sizeof(fixed_queue_t *) * work_queue_num);
thread->work_queues = (fixed_queue_t **)osi_malloc(sizeof(fixed_queue_t *) * work_queue_num);
if (thread->work_queues == NULL) { if (thread->work_queues == NULL) {
goto _err; goto _err;
} }
thread->work_queue_num = work_queue_num;
for (int i = 0; i < thread->work_queue_num; i++) { for (int i = 0; i < thread->work_queue_num; i++) {
thread->work_queues[i] = fixed_queue_new(DEFAULT_WORK_QUEUE_CAPACITY); thread->work_queues[i] = fixed_queue_new(DEFAULT_WORK_QUEUE_CAPACITY);