Merge commit '618d02c1fa9e74d490cace64a7d15762656b521c'

[ffmpeg] / libavcodec / qpeg.c

diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c
index 654fd998d6abb11efaa7546ca3f7518dfe6b5dd0..d4195c5f0b7f145e7bbbf28dc894c8e0bed4b9ab 100644 (file)
--- a/libavcodec/qpeg.c
+++ b/libavcodec/qpeg.c
@@ -99,6 +99,8 @@ static void qpeg_decode_intra(QpegContext *qctx, uint8_t *dst,
                 }
             }
         } else {
+            if (bytestream2_get_bytes_left(&qctx->buffer) < copy)
+                copy = bytestream2_get_bytes_left(&qctx->buffer);
             for(i = 0; i < copy; i++) {
                 dst[filled++] = bytestream2_get_byte(&qctx->buffer);
                 if (filled >= width) {