aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-01-08 16:37:56 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2017-05-20 03:41:33 +0200
commit344e5de99390d3408dea01130f53e11d70cf24d8 (patch)
tree2b411cf32c9cf6564cfabd12dacfd1033dae3c36
parent9c7730417dec3e1bab15fe3a7b4ec659474281ff (diff)
downloadffmpeg-344e5de99390d3408dea01130f53e11d70cf24d8.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 3bc31a4545..af433d9a4e 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -408,7 +408,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)