From 1c6246f1639d12e5b2b721f335807dade0a4baf3 Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Sat, 13 Dec 2014 00:10:06 +0100 Subject: Avoid overflow when calculating number of pixels in an image CID 1041131, 1041132 --- demuxer/Demuxers/LAVFDemuxer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demuxer') diff --git a/demuxer/Demuxers/LAVFDemuxer.cpp b/demuxer/Demuxers/LAVFDemuxer.cpp index e56d4cf1..c4c44aa4 100644 --- a/demuxer/Demuxers/LAVFDemuxer.cpp +++ b/demuxer/Demuxers/LAVFDemuxer.cpp @@ -1922,8 +1922,8 @@ const CBaseDemuxer::stream *CLAVFDemuxer::SelectVideoStream() } if (!best) { best = check; continue; } - uint64_t bestPixels = m_avFormat->streams[best->pid]->codec->width * m_avFormat->streams[best->pid]->codec->height; - uint64_t checkPixels = m_avFormat->streams[check->pid]->codec->width * m_avFormat->streams[check->pid]->codec->height; + uint64_t bestPixels = (uint64_t)m_avFormat->streams[best->pid]->codec->width * m_avFormat->streams[best->pid]->codec->height; + uint64_t checkPixels = (uint64_t)m_avFormat->streams[check->pid]->codec->width * m_avFormat->streams[check->pid]->codec->height; if (m_avFormat->streams[best->pid]->codec->codec_id == AV_CODEC_ID_NONE && m_avFormat->streams[check->pid]->codec->codec_id != AV_CODEC_ID_NONE) { best = check; -- cgit v1.2.3