[FFmpeg-cvslog] mem: Do not check unsigned values for negative size

Diego Biurrun git at videolan.org
Fri Sep 6 12:33:13 CEST 2013


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Sep  4 12:28:01 2013 +0200| [c3e6e8f06c42499bd020fd0b37f9542150e6067b] | committer: Diego Biurrun

mem: Do not check unsigned values for negative size

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

 libavutil/mem.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavutil/mem.c b/libavutil/mem.c
index b4a190a..5f64f56 100644
--- a/libavutil/mem.c
+++ b/libavutil/mem.c
@@ -138,7 +138,7 @@ void *av_realloc(void *ptr, size_t size)
 
 void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
 {
-    if (size <= 0 || nmemb >= INT_MAX / size)
+    if (!size || nmemb >= INT_MAX / size)
         return NULL;
     return av_realloc(ptr, nmemb * size);
 }
@@ -147,9 +147,9 @@ int av_reallocp_array(void *ptr, size_t nmemb, size_t size)
 {
     void **ptrptr = ptr;
     void *ret;
-    if (size <= 0 || nmemb >= INT_MAX / size)
+    if (!size || nmemb >= INT_MAX / size)
         return AVERROR(ENOMEM);
-    if (nmemb <= 0) {
+    if (!nmemb) {
         av_freep(ptr);
         return 0;
     }



More information about the ffmpeg-cvslog mailing list