Skip to content

Commit

Permalink
Merge branch 'bugfix/handle_issue_of_malloc_fail' into 'master'
Browse files Browse the repository at this point in the history
bugfix/avoid unexpected free when malloc failed

Closes IDFGH-8518

See merge request espressif/esp-idf!20723
  • Loading branch information
wmy-espressif committed Oct 25, 2022
2 parents 7c770a9 + cd2492f commit 2d2d0ba
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions components/bt/common/osi/thread.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,17 +214,17 @@ osi_thread_t *osi_thread_create(const char *name, size_t stack_size, int priorit
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) {
goto _err;
}

thread->stop = false;
thread->work_queue_num = work_queue_num;
thread->work_queues = (struct work_queue **)osi_malloc(sizeof(struct work_queue *) * work_queue_num);
thread->work_queues = (struct work_queue **)osi_calloc(sizeof(struct work_queue *) * work_queue_num);
if (thread->work_queues == NULL) {
goto _err;
}
thread->work_queue_num = work_queue_num;

for (int i = 0; i < thread->work_queue_num; i++) {
size_t queue_len = work_queue_len[i] ? work_queue_len[i] : DEFAULT_WORK_QUEUE_CAPACITY;
Expand Down

0 comments on commit 2d2d0ba

Please sign in to comment.