From c5fb6657fd5b2735d1deb4daff1df7f276d9cd5d Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sun, 12 Jul 2015 00:36:48 +0200 Subject: [PATCH] Use nlr_raise in xalloc --- src/omv/xalloc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/omv/xalloc.c b/src/omv/xalloc.c index 4245edc0a..fd3fd6a44 100644 --- a/src/omv/xalloc.c +++ b/src/omv/xalloc.c @@ -20,8 +20,7 @@ void *xalloc(uint32_t size) { void *mem = gc_alloc(size, false); if (mem == NULL) { - mp_obj_exception_clear_traceback(oom_interrupt); - pendsv_nlr_jump(oom_interrupt); + nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Out of Memory!!")); } return mem; } @@ -30,8 +29,7 @@ void *xalloc0(uint32_t size) { void *mem = gc_alloc(size, false); if (mem == NULL) { - mp_obj_exception_clear_traceback(oom_interrupt); - pendsv_nlr_jump(oom_interrupt); + nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Out of Memory!!")); } memset(mem, 0, size); return mem; @@ -46,8 +44,7 @@ void *xrealloc(void *ptr, uint32_t size) { ptr = gc_realloc(ptr, size); if (ptr == NULL) { - mp_obj_exception_clear_traceback(oom_interrupt); - pendsv_nlr_jump(oom_interrupt); + nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Out of Memory!!")); } return ptr; }