[FFmpeg-cvslog] avcodec/qdrw: fix decoding odd size images for 16bit case

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Feb 27 11:24:43 2017 +0100| [05aa53dc553a9f824d81d7eaa0eb16b978264276] | committer: Paul B Mahol

avcodec/qdrw: fix decoding odd size images for 16bit case

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavcodec/qdrw.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c
index e650f49..e09872b 100644
--- a/libavcodec/qdrw.c
+++ b/libavcodec/qdrw.c
@@ -199,26 +199,18 @@ static int decode_rle16(AVCodecContext *avctx, AVFrame *p, GetByteContext *gbc)
             if (code & 0x80 ) { /* run */
                 pix = bytestream2_get_be16(gbc);
                 for (j = 0; j < 257 - code; j++) {
-                    out[pos] = pix;
-                    pos++;
-                    if (pos >= offset) {
-                        pos -= offset;
-                        pos++;
+                    if (pos < offset) {
+                        out[pos++] = pix;
                     }
-                    if (pos >= offset)
-                        return AVERROR_INVALIDDATA;
                 }
                 left  -= 3;
             } else { /* copy */
                 for (j = 0; j < code + 1; j++) {
-                    out[pos] = bytestream2_get_be16(gbc);
-                    pos++;
-                    if (pos >= offset) {
-                        pos -= offset;
-                        pos++;
+                    if (pos < offset) {
+                        out[pos++] = bytestream2_get_be16(gbc);
+                    } else {
+                        bytestream2_skip(gbc, 2);
                     }
-                    if (pos >= offset)
-                        return AVERROR_INVALIDDATA;
                 }
                 left  -= 1 + (code + 1) * 2;
             }