[FFmpeg-cvslog] avformat/nsvdec: Use av_malloc_array()

Michael Niedermayer git at videolan.org
Sat Apr 11 13:59:22 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 11 13:18:41 2015 +0200| [e0d8ff5ef105fb281323f05983b9d62f57ff4d35] | committer: Michael Niedermayer

avformat/nsvdec: Use av_malloc_array()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/nsvdec.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index 59b7938..c9c0a74 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -346,7 +346,7 @@ static int nsv_parse_NSVf_header(AVFormatContext *s)
         nsv->index_entries = table_entries_used;
         if((unsigned)table_entries_used >= UINT_MAX / sizeof(uint32_t))
             return -1;
-        nsv->nsvs_file_offset = av_malloc((unsigned)table_entries_used * sizeof(uint32_t));
+        nsv->nsvs_file_offset = av_malloc_array((unsigned)table_entries_used, sizeof(uint32_t));
         if (!nsv->nsvs_file_offset)
             return AVERROR(ENOMEM);
 
@@ -355,7 +355,7 @@ static int nsv_parse_NSVf_header(AVFormatContext *s)
 
         if(table_entries > table_entries_used &&
            avio_rl32(pb) == MKTAG('T','O','C','2')) {
-            nsv->nsvs_timestamps = av_malloc((unsigned)table_entries_used*sizeof(uint32_t));
+            nsv->nsvs_timestamps = av_malloc_array((unsigned)table_entries_used, sizeof(uint32_t));
             if (!nsv->nsvs_timestamps)
                 return AVERROR(ENOMEM);
             for(i=0;i<table_entries_used;i++) {



More information about the ffmpeg-cvslog mailing list