From e33806aaff5787d57bd708f99e565f1c490fc069 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Wed, 4 May 2016 09:14:43 +0000
Subject: [PATCH] py/gc: Fix 2 cases of concurrent access to ATB and FTB.
---
py/gc.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/py/gc.c b/py/gc.c
index b5cf9497d..a40b9878f 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -594,13 +594,14 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
// get first block
size_t block = BLOCK_FROM_PTR(ptr);
+ GC_ENTER();
+
// sanity check the ptr is pointing to the head of a block
if (ATB_GET_KIND(block) != AT_HEAD) {
+ GC_EXIT();
return NULL;
}
- GC_ENTER();
-
if (MP_STATE_MEM(gc_lock_depth) > 0) {
GC_EXIT();
return NULL;
@@ -682,6 +683,12 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
return ptr_in;
}
+ #if MICROPY_ENABLE_FINALISER
+ bool ftb_state = FTB_GET(block);
+ #else
+ bool ftb_state = false;
+ #endif
+
GC_EXIT();
if (!allow_move) {
@@ -690,13 +697,7 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
}
// can't resize inplace; try to find a new contiguous chain
- void *ptr_out = gc_alloc(n_bytes,
-#if MICROPY_ENABLE_FINALISER
- FTB_GET(block)
-#else
- false
-#endif
- );
+ void *ptr_out = gc_alloc(n_bytes, ftb_state);
// check that the alloc succeeded
if (ptr_out == NULL) {
--
GitLab