Merge remote-tracking branch 'adafruit/master' into ld-cleanup

1 files changed, 3 insertions, 0 deletions

diff --git a/py/gc.c b/py/gc.c
index a8a5fde12..5e631f5ed 100755
--- a/py/gc.c
+++ b/py/gc.c
@@ -667,6 +667,9 @@ void gc_free(void *ptr) {
     if (ptr == NULL) {
         GC_EXIT();
     } else {
+        if (MP_STATE_MEM(gc_pool_start) == 0) {
+            reset_into_safe_mode(GC_ALLOC_OUTSIDE_VM);
+        }
         // get the GC block number corresponding to this pointer
         assert(VERIFY_PTR(ptr));
         size_t block = BLOCK_FROM_PTR(ptr);