RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2017-02-27 11:24:43 +01:00
parent f8d2079a67
commit 05aa53dc55
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/qdrw.c
View File

@ -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;
}