[FFmpeg-cvslog] avcodec/tiff: use av_malloc(z)_array()
Michael Niedermayer
git at videolan.org
Sun Apr 20 18:25:15 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 20 17:32:17 2014 +0200| [8c88ea76df9b692cc40c4a4826534a02d38a088a] | committer: Michael Niedermayer
avcodec/tiff: 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=8c88ea76df9b692cc40c4a4826534a02d38a088a
---
libavcodec/tiff.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index c6193ad..02d5007 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -838,7 +838,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
s->geotag_count = 0;
return -1;
}
- s->geotags = av_mallocz(sizeof(TiffGeoTag) * s->geotag_count);
+ s->geotags = av_mallocz_array(s->geotag_count, sizeof(TiffGeoTag));
if (!s->geotags) {
av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
s->geotag_count = 0;
@@ -860,7 +860,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
return AVERROR_INVALIDDATA;
if (bytestream2_get_bytes_left(&s->gb) < count * sizeof(int64_t))
return AVERROR_INVALIDDATA;
- dp = av_malloc(count * sizeof(double));
+ dp = av_malloc_array(count, sizeof(double));
if (!dp) {
av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
goto end;
More information about the ffmpeg-cvslog
mailing list