From c07a22fb9fc5cfa24b5b80f83e8f08b17937ca97 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 27 Jul 2004 11:09:41 +0000
Subject: [PATCH] realloc(NULL) fix
Originally committed as revision 3351 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/mem.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavcodec/mem.c b/libavcodec/mem.c
index 35c83050333..9eaa09ed62d 100644
--- a/libavcodec/mem.c
+++ b/libavcodec/mem.c
@@ -95,7 +95,9 @@ void *av_realloc(void *ptr, unsigned int size)
{
#ifdef MEMALIGN_HACK
//FIXME this isnt aligned correctly though it probably isnt needed
- int diff= ptr ? ((char*)ptr)[-1] : 0;
+ int diff;
+ if(!ptr) return av_malloc(size);
+ diff= ((char*)ptr)[-1];
return realloc(ptr - diff, size + diff) + diff;
#else
return realloc(ptr, size);
--
GitLab