[FFmpeg-cvslog] Revert "avformat/wvdec: Check rate for overflow"

Michael Niedermayer git at videolan.org
Fri Sep 10 18:59:02 EEST 2021


ffmpeg | branch: release/4.1 | Michael Niedermayer <michael at niedermayer.cc> | Fri Sep 10 16:00:00 2021 +0200| [fbb83f3d413fa33cd543015856b0171d0bd7de11] | committer: Michael Niedermayer

Revert "avformat/wvdec: Check rate for overflow"

The code this fixes is not in release/4.1

Found-by: <mkver>
This reverts commit b81d1379c296de48ebcc7ead0b3f22a4265b0ea1.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fbb83f3d413fa33cd543015856b0171d0bd7de11
---

 libavformat/wvdec.c | 3 +--
 1 file changed, 1 insertion(+), 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;



More information about the ffmpeg-cvslog mailing list