har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "avformat/wvdec: Check rate for overflow"

Browse Source 
The code this fixes is not in release/4.1

Found-by: <mkver>
This reverts commit b81d1379c296de48ebcc7ead0b3f22a4265b0ea1.
This commit is contained in:
Michael Niedermayer 2021-09-10 16:00:00 +02:00
parent add3d4048d
commit fbb83f3d41
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/wvdec.c
View File

@ -81,7 +81,6 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb)
int ret; int ret;
int rate, bpp, chan; int rate, bpp, chan;
uint32_t chmask, flags; uint32_t chmask, flags;
unsigned rate_x;
wc->pos = avio_tell(pb); wc->pos = avio_tell(pb);
@ -180,7 +179,7 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb)
if (id & 0x40) if (id & 0x40)
avio_skip(pb, 1); avio_skip(pb, 1);
} }
if (rate == -1 || rate * (uint64_t)rate_x >= INT_MAX) { if (rate == -1) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
"Cannot determine custom sampling rate\n"); "Cannot determine custom sampling rate\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;