[FFmpeg-cvslog] avcodec/pgssubdec: Use av_malloc(z)_array()

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 22 15:04:34 2014 +0200| [e8e9186a70ae949226601d2bf23dfedcd09c5f83] | committer: Michael Niedermayer

avcodec/pgssubdec: Use av_malloc(z)_array()

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

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

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

diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
index b2c779a..df612de 100644
--- a/libavcodec/pgssubdec.c
+++ b/libavcodec/pgssubdec.c
@@ -341,7 +341,7 @@ static int parse_presentation_segment(AVCodecContext *avctx,
     }
 
     av_freep(&ctx->presentation.objects);
-    ctx->presentation.objects = av_malloc(sizeof(PGSSubPictureReference) * ctx->presentation.object_count);
+    ctx->presentation.objects = av_malloc_array(ctx->presentation.object_count, sizeof(PGSSubPictureReference));
     if (!ctx->presentation.objects) {
         ctx->presentation.object_count = 0;
         return AVERROR(ENOMEM);
@@ -417,7 +417,7 @@ static int display_end_segment(AVCodecContext *avctx, void *data,
     sub->format             = 0;
 
     sub->num_rects = ctx->presentation.object_count;
-    sub->rects     = av_mallocz(sizeof(*sub->rects) * sub->num_rects);
+    sub->rects     = av_mallocz_array(sub->num_rects, sizeof(*sub->rects));
 
     for (rect = 0; rect < sub->num_rects; ++rect) {
         uint16_t picture_id    = ctx->presentation.objects[rect].picture_id;