[FFmpeg-cvslog] mem: define the MAX_MALLOC_SIZE constant and use it in place of INT_MAX

Stefano Sabatini git at videolan.org
Tue May 24 00:48:21 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Wed May 18 23:59:38 2011 +0200| [6b4c0be5586acad3bbafd7d2dd02a8328a5ab632] | committer: Stefano Sabatini

mem: define the MAX_MALLOC_SIZE constant and use it in place of INT_MAX

This makes re-dimensionating the constant simpler, since now it is
defined only in one place.

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

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

diff --git a/libavutil/mem.c b/libavutil/mem.c
index 57dc658..29ecbfa 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -65,6 +65,8 @@ void  free(void *ptr);
    memory allocator. You do not need to suppress this file because the
    linker will do it automatically. */
 
+#define MAX_MALLOC_SIZE INT_MAX
+
 void *av_malloc(size_t size)
 {
     void *ptr = NULL;
@@ -73,7 +75,7 @@ void *av_malloc(size_t size)
 #endif
 
     /* let's disallow possible ambiguous cases */
-    if(size > (INT_MAX-32) )
+    if (size > (MAX_MALLOC_SIZE-32))
         return NULL;
 
 #if CONFIG_MEMALIGN_HACK
@@ -127,7 +129,7 @@ void *av_realloc(void *ptr, size_t size)
 #endif
 
     /* let's disallow possible ambiguous cases */
-    if(size > (INT_MAX-16) )
+    if (size > (MAX_MALLOC_SIZE-16))
         return NULL;
 
 #if CONFIG_MEMALIGN_HACK



More information about the ffmpeg-cvslog mailing list