# HG changeset patch # User michael # Date 1105528452 0 # Node ID d0bcc85d3856729ce06e60c13a1930eae1f1fce8 # Parent 35ca0ef0c27949933abf6d24c743847d3392648e 10l (gcc 2.95 fix) diff -r 35ca0ef0c279 -r d0bcc85d3856 mem.c --- a/mem.c Wed Jan 12 01:44:02 2005 +0000 +++ b/mem.c Wed Jan 12 11:14:12 2005 +0000 @@ -45,13 +45,13 @@ void *av_malloc(unsigned int size) { void *ptr; + int diff; /* lets disallow possible ambiguous cases */ if(size > INT_MAX) return NULL; #ifdef MEMALIGN_HACK - int diff; ptr = malloc(size+16+1); diff= ((-(int)ptr - 1)&15) + 1; ptr += diff; @@ -97,13 +97,13 @@ */ void *av_realloc(void *ptr, unsigned int size) { + int diff; /* lets disallow possible ambiguous cases */ if(size > INT_MAX) return NULL; #ifdef MEMALIGN_HACK //FIXME this isnt aligned correctly though it probably isnt needed - int diff; if(!ptr) return av_malloc(size); diff= ((char*)ptr)[-1]; return realloc(ptr - diff, size + diff) + diff;