generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/shorten: Fix code depending on signed overflow behavior

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2d15588124)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-05-15 16:58:51 +02:00
parent c14359f24d
commit d2fbf8b569
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/shorten.c
View File

@@ -129,8 +129,7 @@ static int allocate_buffers(ShortenContext *s)
av_log(s->avctx, AV_LOG_ERROR, "nmean too large\n"); av_log(s->avctx, AV_LOG_ERROR, "nmean too large\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (s->blocksize + s->nwrap >= UINT_MAX / sizeof(int32_t) || if (s->blocksize + (uint64_t)s->nwrap >= UINT_MAX / sizeof(int32_t)) {
s->blocksize + s->nwrap <= (unsigned)s->nwrap) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"s->blocksize + s->nwrap too large\n"); "s->blocksize + s->nwrap too large\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;