[FFmpeg-cvslog] avformat/westwood_audenc: Check for, not assert on invalid data

Andreas Rheinhardt git at videolan.org
Mon Apr 26 17:49:14 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Apr 26 14:48:33 2021 +0200| [a64d4de0d44a07bcea49f24c2a8a972954e81d0a] | committer: Andreas Rheinhardt

avformat/westwood_audenc: Check for, not assert on invalid data

Reviewed-by: Zane van Iperen <zane at zanevaniperen.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavformat/westwood_audenc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/westwood_audenc.c b/libavformat/westwood_audenc.c
index 4ec905b088..490f2ee260 100644
--- a/libavformat/westwood_audenc.c
+++ b/libavformat/westwood_audenc.c
@@ -103,7 +103,8 @@ static int wsaud_write_packet(AVFormatContext *ctx, AVPacket *pkt)
     AVIOContext  *pb = ctx->pb;
     AUDMuxContext *a = ctx->priv_data;
 
-    av_assert1(pkt->size < UINT16_MAX && (pkt->size * 4) < UINT16_MAX);
+    if (pkt->size > UINT16_MAX / 4)
+        return AVERROR_INVALIDDATA;
     /* Assumes ADPCM since this muxer doesn't support SND1 or PCM format. */
     avio_wl16(pb, pkt->size);
     avio_wl16(pb, pkt->size * 4);



More information about the ffmpeg-cvslog mailing list