Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-09-10 17:00:00 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2021-09-10 17:04:39 +0300
commitfbb83f3d413fa33cd543015856b0171d0bd7de11 (patch)
treec21d0771c316eadf16be6529baca3a1c365b134f
parentadd3d4048d135bc1a6b883a350115823916a54a2 (diff)
Revert "avformat/wvdec: Check rate for overflow"n4.1.7
The code this fixes is not in release/4.1 Found-by: <mkver> This reverts commit b81d1379c296de48ebcc7ead0b3f22a4265b0ea1.
-rw-r--r--libavformat/wvdec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/wvdec.c b/libavformat/wvdec.c
index 8ddebf8033..2060523c3b 100644
--- a/libavformat/wvdec.c
+++ b/libavformat/wvdec.c
@@ -81,7 +81,6 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb)
int ret;
int rate, bpp, chan;
uint32_t chmask, flags;
- unsigned rate_x;
wc->pos = avio_tell(pb);
@@ -180,7 +179,7 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb)
if (id & 0x40)
avio_skip(pb, 1);
}
- if (rate == -1 || rate * (uint64_t)rate_x >= INT_MAX) {
+ if (rate == -1) {
av_log(ctx, AV_LOG_ERROR,
"Cannot determine custom sampling rate\n");
return AVERROR_INVALIDDATA;