Commit 8c88ea76 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/tiff: use av_malloc(z)_array()

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 1fd5c7f1
...@@ -838,7 +838,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) ...@@ -838,7 +838,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
s->geotag_count = 0; s->geotag_count = 0;
return -1; return -1;
} }
s->geotags = av_mallocz(sizeof(TiffGeoTag) * s->geotag_count); s->geotags = av_mallocz_array(s->geotag_count, sizeof(TiffGeoTag));
if (!s->geotags) { if (!s->geotags) {
av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n"); av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
s->geotag_count = 0; s->geotag_count = 0;
...@@ -860,7 +860,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame) ...@@ -860,7 +860,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (bytestream2_get_bytes_left(&s->gb) < count * sizeof(int64_t)) if (bytestream2_get_bytes_left(&s->gb) < count * sizeof(int64_t))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
dp = av_malloc(count * sizeof(double)); dp = av_malloc_array(count, sizeof(double));
if (!dp) { if (!dp) {
av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n"); av_log(s->avctx, AV_LOG_ERROR, "Error allocating temporary buffer\n");
goto end; goto end;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment