highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/qdrw: fix decoding of odd sized images for 8bpp

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2017-02-27 11:49:59 +01:00
parent dc78696ea4
commit 1dcf91f2d3
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/qdrw.c
View File

@@ -231,26 +231,24 @@ static int decode_rle(AVCodecContext *avctx, AVFrame *p, GetByteContext *gbc,
if (code & 0x80 ) { /* run */ if (code & 0x80 ) { /* run */
pix = bytestream2_get_byte(gbc); pix = bytestream2_get_byte(gbc);
for (j = 0; j < 257 - code; j++) { for (j = 0; j < 257 - code; j++) {
if (pos < offset)
out[pos] = pix; out[pos] = pix;
pos += step; pos += step;
if (pos >= offset) { if (pos >= offset && step > 1) {
pos -= offset; pos -= offset;
pos++; pos++;
} }
if (pos >= offset)
return AVERROR_INVALIDDATA;
} }
left -= 2; left -= 2;
} else { /* copy */ } else { /* copy */
for (j = 0; j < code + 1; j++) { for (j = 0; j < code + 1; j++) {
if (pos < offset)
out[pos] = bytestream2_get_byte(gbc); out[pos] = bytestream2_get_byte(gbc);
pos += step; pos += step;
if (pos >= offset) { if (pos >= offset && step > 1) {
pos -= offset; pos -= offset;
pos++; pos++;
} }
if (pos >= offset)
return AVERROR_INVALIDDATA;
} }
left -= 2 + code; left -= 2 + code;
} }