virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

avutil/mem: do a small set of checks for memalign hack before freeing.

Browse Source 
These can detect some kinds of memory and or pointer corruptions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-22 20:30:52 +01:00
parent 89c77b6b15
commit 2c21d34ea4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavutil/mem.c
View File

@ -36,6 +36,7 @@
#include <malloc.h> #include <malloc.h>
#endif #endif
#include "avassert.h"
#include "avutil.h" #include "avutil.h"
#include "intreadwrite.h" #include "intreadwrite.h"
#include "mem.h" #include "mem.h"
@ -148,6 +149,7 @@ void *av_realloc(void *ptr, size_t size)
if (!ptr) if (!ptr)
return av_malloc(size); return av_malloc(size);
diff = ((char *)ptr)[-1]; diff = ((char *)ptr)[-1];
av_assert0(diff>0 && diff<=ALIGN);
ptr = realloc((char *)ptr - diff, size + diff); ptr = realloc((char *)ptr - diff, size + diff);
if (ptr) if (ptr)
ptr = (char *)ptr + diff; ptr = (char *)ptr + diff;
@ -177,8 +179,11 @@ void *av_realloc_f(void *ptr, size_t nelem, size_t elsize)
void av_free(void *ptr) void av_free(void *ptr)
{ {
#if CONFIG_MEMALIGN_HACK #if CONFIG_MEMALIGN_HACK
if (ptr) if (ptr) {
free((char *)ptr - ((char *)ptr)[-1]); int v= ((char *)ptr)[-1];
av_assert0(v>0 && v<=ALIGN);
free((char *)ptr - v);
}
#elif HAVE_ALIGNED_MALLOC #elif HAVE_ALIGNED_MALLOC
_aligned_free(ptr); _aligned_free(ptr);
#else #else