Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change oggmalloc.c to use size_t and kill a warning about type-punning. Align the size before checking out-of-mem so no overlap may occur between tmp and alloc.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15525 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2007-11-08 08:55:01 +00:00
parent a50a80e1a3
commit d67c29302a
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/codecs/Tremor/oggmalloc.c
View file

@ -1,11 +1,11 @@
#include <os_types.h>
static unsigned char *mallocbuf;
static long bufsize, tmp_ptr, mem_ptr;
static size_t bufsize, tmp_ptr, mem_ptr;
void ogg_malloc_init(void)
{
mallocbuf = (unsigned char *)ci->get_codec_memory((size_t *)&bufsize);
mallocbuf = ci->get_codec_memory(&bufsize);
tmp_ptr = bufsize & ~3;
mem_ptr = 0;
}
@ -14,21 +14,25 @@ void *ogg_malloc(size_t size)
{
void* x;
if (mem_ptr + (long)size > tmp_ptr)
size = (size + 3) & ~3;
if (mem_ptr + size > tmp_ptr)
return NULL;
x = &mallocbuf[mem_ptr];
mem_ptr += (size + 3) & ~3; /* Keep memory 32-bit aligned */
mem_ptr += size; /* Keep memory 32-bit aligned */
return x;
}
void *ogg_tmpmalloc(size_t size)
{
if (mem_ptr + (long)size > tmp_ptr)
size = (size + 3) & ~3;
if (mem_ptr + size > tmp_ptr)
return NULL;
tmp_ptr -= (size + 3) & ~3;
tmp_ptr -= size;
return &mallocbuf[tmp_ptr];
}