[FFmpeg-cvslog] avformat/ico: use avmalloc(z)_array()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 16 19:41:41 2014 +0200| [dd77f6469a898a5c00e2b9b3ff8093db05006ce9] | committer: Michael Niedermayer

avformat/ico: use avmalloc(z)_array()

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

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

 libavformat/icodec.c |    2 +-
 libavformat/icoenc.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/icodec.c b/libavformat/icodec.c
index 4c038e9..847f0ee 100644
--- a/libavformat/icodec.c
+++ b/libavformat/icodec.c
@@ -58,7 +58,7 @@ static int read_header(AVFormatContext *s)
     avio_skip(pb, 4);
     ico->nb_images = avio_rl16(pb);
 
-    ico->images = av_malloc(ico->nb_images * sizeof(IcoImage));
+    ico->images = av_malloc_array(ico->nb_images, sizeof(IcoImage));
     if (!ico->images)
         return AVERROR(ENOMEM);
 
diff --git a/libavformat/icoenc.c b/libavformat/icoenc.c
index 561c6ca..dcf9065 100644
--- a/libavformat/icoenc.c
+++ b/libavformat/icoenc.c
@@ -101,7 +101,7 @@ static int ico_write_header(AVFormatContext *s)
         avio_skip(pb, 16);
     }
 
-    ico->images = av_mallocz(ico->nb_images * sizeof(IcoMuxContext));
+    ico->images = av_mallocz_array(ico->nb_images, sizeof(IcoMuxContext));
     if (!ico->images)
         return AVERROR(ENOMEM);