Skip to content

Commit 5c7a237

Browse files
committed
Merge branch 'fix/lwip_port_consistent_alloc' into 'master'
[lwip]: Make lwip alloc/free consistend in port layer Closes IDFGH-10271 See merge request espressif/esp-idf!42081
2 parents 22a0f9a + d744d16 commit 5c7a237

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

components/lwip/port/freertos/sys_arch.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* SPDX-License-Identifier: BSD-3-Clause
55
*
6-
* SPDX-FileContributor: 2018-2024 Espressif Systems (Shanghai) CO LTD
6+
* SPDX-FileContributor: 2018-2025 Espressif Systems (Shanghai) CO LTD
77
*/
88

99
/* lwIP includes. */
@@ -215,7 +215,7 @@ sys_mbox_new(sys_mbox_t *mbox, int size)
215215

216216
if ((*mbox)->os_mbox == NULL) {
217217
LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("fail to new (*mbox)->os_mbox\n"));
218-
free(*mbox);
218+
mem_free(*mbox);
219219
return ERR_MEM;
220220
}
221221

@@ -363,7 +363,7 @@ sys_mbox_free(sys_mbox_t *mbox)
363363
LWIP_ASSERT("mbox quence not empty", msgs_waiting == 0);
364364

365365
vQueueDelete((*mbox)->os_mbox);
366-
free(*mbox);
366+
mem_free(*mbox);
367367
*mbox = NULL;
368368

369369
(void)msgs_waiting;
@@ -497,7 +497,7 @@ sys_thread_sem_free(void* data) // destructor for TLS semaphore
497497

498498
if (sem) {
499499
LWIP_DEBUGF(ESP_THREAD_SAFE_DEBUG, ("sem pointer del, sem_p=%p\n", sem));
500-
free(sem);
500+
mem_free(sem);
501501
}
502502
}
503503

@@ -513,7 +513,7 @@ sys_thread_sem_init(void)
513513

514514
*sem = xSemaphoreCreateBinary();
515515
if (!(*sem)){
516-
free(sem);
516+
mem_free(sem);
517517
ESP_LOGE(TAG, "thread_sem_init: out of memory");
518518
return 0;
519519
}

0 commit comments

Comments
 (0)