Skip to content

Commit 67d8d36

Browse files
authored
Merge pull request #10617 from bablokb/backport_lwip_fix
backport of a96f112 from main (lwip_mem.c: put storage ops in a critical section)
2 parents 71173fa + cd1dc14 commit 67d8d36

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

ports/raspberrypi/lwip_src/lwip_mem.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,20 @@
88
#include <string.h>
99
#include "lib/tlsf/tlsf.h"
1010
#include "lwip_mem.h"
11+
#include "shared-bindings/microcontroller/__init__.h"
1112
#include "supervisor/port_heap.h"
1213

1314
void *lwip_heap_malloc(size_t size) {
14-
return port_malloc(size, true);
15+
common_hal_mcu_disable_interrupts();
16+
void *ptr = port_malloc(size, true);
17+
common_hal_mcu_enable_interrupts();
18+
return ptr;
1519
}
1620

1721
void lwip_heap_free(void *ptr) {
22+
common_hal_mcu_disable_interrupts();
1823
port_free(ptr);
24+
common_hal_mcu_enable_interrupts();
1925
}
2026

2127
void *lwip_heap_calloc(size_t num, size_t size) {

0 commit comments

Comments
 (0)