From: Michael Niedermayer Date: Mon, 5 May 2014 21:11:04 +0000 (+0200) Subject: avformat/segment: Use av_malloc_array() X-Git-Tag: n2.3~1332 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=1394e0a9e03ea59a19668cd152b7dd1ca3aa880e avformat/segment: Use av_malloc_array() Signed-off-by: Michael Niedermayer --- diff --git a/libavformat/segment.c b/libavformat/segment.c index ae27a958f5..fe84f2710d 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -373,7 +373,7 @@ static int parse_times(void *log_ctx, int64_t **times, int *nb_times, if (*p == ',') (*nb_times)++; - *times = av_malloc(sizeof(**times) * *nb_times); + *times = av_malloc_array(*nb_times, sizeof(**times)); if (!*times) { av_log(log_ctx, AV_LOG_ERROR, "Could not allocate forced times array\n"); FAIL(AVERROR(ENOMEM)); @@ -431,7 +431,7 @@ static int parse_frames(void *log_ctx, int **frames, int *nb_frames, if (*p == ',') (*nb_frames)++; - *frames = av_malloc(sizeof(**frames) * *nb_frames); + *frames = av_malloc_array(*nb_frames, sizeof(**frames)); if (!*frames) { av_log(log_ctx, AV_LOG_ERROR, "Could not allocate forced frames array\n"); FAIL(AVERROR(ENOMEM));