Add setjmp/longjmp for ARM and ColdFire to the codec lib, and use it in the Vorbis codec to better handle out of memory conditions (to exit rather than crash; the AAC codec could use it too). setjmp/longjmp comes from newlib 1.17.0 with a few minor changes (combine parts of some files, remove support for some architectures, change some ifdef's).

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20235 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 9 insertions, 0 deletions

diff --git a/apps/codecs/libtremor/oggmalloc.c b/apps/codecs/libtremor/oggmalloc.c
index ca917ff397..4aa2760629 100644
--- a/apps/codecs/libtremor/oggmalloc.c
+++ b/apps/codecs/libtremor/oggmalloc.c
@@ -1,5 +1,10 @@
 #include "os_types.h"
 
+#if defined(CPU_ARM) || defined(CPU_COLDFIRE)
+#include <setjmp.h>
+extern jmp_buf rb_jump_buf;
+#endif
+
 static size_t tmp_ptr;
 
 void ogg_malloc_init(void)
@@ -16,7 +21,11 @@ void *ogg_malloc(size_t size)
     size = (size + 3) & ~3;
 
     if (mem_ptr + size > tmp_ptr)
+#if defined(CPU_ARM) || defined(CPU_COLDFIRE)
+        longjmp(rb_jump_buf, 1);
+#else
         return NULL;
+#endif
     
     x = &mallocbuf[mem_ptr];
     mem_ptr += size; /* Keep memory 32-bit aligned */