From 410f30772fa3e121d1c6f8c9e2418fad7579e6f4 Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 25 Apr 2014 11:44:53 +0000 Subject: [PATCH] py, gc: Fix old gc_realloc for case when NULL is passed in as ptr. --- py/gc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/py/gc.c b/py/gc.c index 9a5f9d89bf..68ddfd4cad 100644 --- a/py/gc.c +++ b/py/gc.c @@ -435,14 +435,17 @@ void *gc_realloc(void *ptr, machine_uint_t n_bytes) { if (n_bytes <= n_existing) { return ptr; } else { - // TODO false is incorrect! Should get value from current block! - void *ptr2 = gc_alloc(n_bytes, + bool has_finaliser; + if (ptr == NULL) { + has_finaliser = false; + } else { #if MICROPY_ENABLE_FINALISER - FTB_GET(BLOCK_FROM_PTR((machine_uint_t)ptr)) + has_finaliser = FTB_GET(BLOCK_FROM_PTR((machine_uint_t)ptr)); #else - false + has_finaliser = false; #endif - ); + } + void *ptr2 = gc_alloc(n_bytes, has_finaliser); if (ptr2 == NULL) { return ptr2; }