[FFmpeg-cvslog] Fix all malloc(0) issues

Michael Niedermayer git at videolan.org
Fri Apr 29 02:16:18 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 29 02:13:59 2011 +0200| [5a36783bc4a1887a67dbfe5ec7198903f35a46b1] | committer: Michael Niedermayer

Fix all malloc(0) issues
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a36783bc4a1887a67dbfe5ec7198903f35a46b1
---

 libavutil/mem.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavutil/mem.c b/libavutil/mem.c
index 90f8667..f0f18d1 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -71,6 +71,8 @@ void *av_malloc(size_t size)
     /* let's disallow possible ambiguous cases */
     if(size > (INT_MAX-32) )
         return NULL;
+    else if(!size)
+        size= 1;
 
 #if CONFIG_MEMALIGN_HACK
     ptr = malloc(size+32);



More information about the ffmpeg-cvslog mailing list