[FFmpeg-cvslog] avcodec/svq3: Reject dx/dy beyond 16bit

Michael Niedermayer git at videolan.org
Wed May 3 13:15:09 EEST 2017


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Apr 27 15:10:26 2017 +0200| [48b3117844177d8442bc9fa3ede1d31ce82ae6fc] | committer: Michael Niedermayer

avcodec/svq3: Reject dx/dy beyond 16bit

The code does use 16bit sized arrays later so larger deltas would not work

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/svq3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 3e35fd73d6..76a465b9c0 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -551,7 +551,7 @@ static inline int svq3_mc_dir(SVQ3Context *s, int size, int mode,
                 dy = get_interleaved_se_golomb(&s->gb_slice);
                 dx = get_interleaved_se_golomb(&s->gb_slice);
 
-                if (dx == INVALID_VLC || dy == INVALID_VLC) {
+                if (dx != (int16_t)dx || dy != (int16_t)dy) {
                     av_log(s->avctx, AV_LOG_ERROR, "invalid MV vlc\n");
                     return -1;
                 }



More information about the ffmpeg-cvslog mailing list