aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-01-08 16:37:56 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-08-23 13:15:17 +0200
commiteac727a50218fe14a792575e3431bed97b07096f (patch)
treead45b0cb818f3be16e60951cd14df3485ed9b0ac
parent78664297df0e94bb38571fc6abc59d2a16af6454 (diff)
downloadffmpeg-eac727a50218fe14a792575e3431bed97b07096f.tar.gz
avcodec/tiff: Perform multiply in tiff_unpack_lzma() as 64bit
This should make no difference as the value should not be able to be that large but its more correct this way Fixes CID1348138 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f48b6b8b91d63148ef50d096688ed7226cd6ddf4) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/tiff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 4ef509774d..c5d5896f9a 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -407,7 +407,7 @@ static int tiff_unpack_lzma(TiffContext *s, AVFrame *p, uint8_t *dst, int stride
const uint8_t *src, int size, int width, int lines,
int strip_start, int is_yuv)
{
- uint64_t outlen = width * lines;
+ uint64_t outlen = width * (uint64_t)lines;
int ret, line;
uint8_t *buf = av_malloc(outlen);
if (!buf)