generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

loco: check that there is data left after decoding a plane.

Browse Source 
CC:libav-stable@libav.org
(cherry picked from commit 067432c1c9)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Anton Khirnov
2013-02-14 09:08:35 +01:00
committed by Reinhard Tartler
parent 88ae77cea4
commit b786ddc0f2
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libavcodec/loco.c
View File

@@ -181,43 +181,70 @@ static int decode_frame(AVCodecContext *avctx,
case LOCO_CYUY2: case LOCO_YUY2: case LOCO_UYVY: case LOCO_CYUY2: case LOCO_YUY2: case LOCO_UYVY:
decoded = loco_decode_plane(l, p->data[0], avctx->width, avctx->height, decoded = loco_decode_plane(l, p->data[0], avctx->width, avctx->height,
p->linesize[0], buf, buf_size, 1); p->linesize[0], buf, buf_size, 1);
if (decoded >= buf_size)
goto buf_too_small;
buf += decoded; buf_size -= decoded; buf += decoded; buf_size -= decoded;
decoded = loco_decode_plane(l, p->data[1], avctx->width / 2, avctx->height, decoded = loco_decode_plane(l, p->data[1], avctx->width / 2, avctx->height,
p->linesize[1], buf, buf_size, 1); p->linesize[1], buf, buf_size, 1);
if (decoded >= buf_size)
goto buf_too_small;
buf += decoded; buf_size -= decoded; buf += decoded; buf_size -= decoded;
decoded = loco_decode_plane(l, p->data[2], avctx->width / 2, avctx->height, decoded = loco_decode_plane(l, p->data[2], avctx->width / 2, avctx->height,
p->linesize[2], buf, buf_size, 1); p->linesize[2], buf, buf_size, 1);
break; break;
case LOCO_CYV12: case LOCO_YV12: case LOCO_CYV12: case LOCO_YV12:
decoded = loco_decode_plane(l, p->data[0], avctx->width, avctx->height, decoded = loco_decode_plane(l, p->data[0], avctx->width, avctx->height,
p->linesize[0], buf, buf_size, 1); p->linesize[0], buf, buf_size, 1);
if (decoded >= buf_size)
goto buf_too_small;
buf += decoded; buf_size -= decoded; buf += decoded; buf_size -= decoded;
decoded = loco_decode_plane(l, p->data[2], avctx->width / 2, avctx->height / 2, decoded = loco_decode_plane(l, p->data[2], avctx->width / 2, avctx->height / 2,
p->linesize[2], buf, buf_size, 1); p->linesize[2], buf, buf_size, 1);
if (decoded >= buf_size)
goto buf_too_small;
buf += decoded; buf_size -= decoded; buf += decoded; buf_size -= decoded;
decoded = loco_decode_plane(l, p->data[1], avctx->width / 2, avctx->height / 2, decoded = loco_decode_plane(l, p->data[1], avctx->width / 2, avctx->height / 2,
p->linesize[1], buf, buf_size, 1); p->linesize[1], buf, buf_size, 1);
break; break;
case LOCO_CRGB: case LOCO_RGB: case LOCO_CRGB: case LOCO_RGB:
decoded = loco_decode_plane(l, p->data[0] + p->linesize[0]*(avctx->height-1), avctx->width, avctx->height, decoded = loco_decode_plane(l, p->data[0] + p->linesize[0]*(avctx->height-1), avctx->width, avctx->height,
-p->linesize[0], buf, buf_size, 3); -p->linesize[0], buf, buf_size, 3);
if (decoded >= buf_size)
goto buf_too_small;
buf += decoded; buf_size -= decoded; buf += decoded; buf_size -= decoded;
decoded = loco_decode_plane(l, p->data[0] + p->linesize[0]*(avctx->height-1) + 1, avctx->width, avctx->height, decoded = loco_decode_plane(l, p->data[0] + p->linesize[0]*(avctx->height-1) + 1, avctx->width, avctx->height,
-p->linesize[0], buf, buf_size, 3); -p->linesize[0], buf, buf_size, 3);
if (decoded >= buf_size)
goto buf_too_small;
buf += decoded; buf_size -= decoded; buf += decoded; buf_size -= decoded;
decoded = loco_decode_plane(l, p->data[0] + p->linesize[0]*(avctx->height-1) + 2, avctx->width, avctx->height, decoded = loco_decode_plane(l, p->data[0] + p->linesize[0]*(avctx->height-1) + 2, avctx->width, avctx->height,
-p->linesize[0], buf, buf_size, 3); -p->linesize[0], buf, buf_size, 3);
break; break;
case LOCO_RGBA: case LOCO_RGBA:
decoded = loco_decode_plane(l, p->data[0], avctx->width, avctx->height, decoded = loco_decode_plane(l, p->data[0], avctx->width, avctx->height,
p->linesize[0], buf, buf_size, 4); p->linesize[0], buf, buf_size, 4);
if (decoded >= buf_size)
goto buf_too_small;
buf += decoded; buf_size -= decoded; buf += decoded; buf_size -= decoded;
decoded = loco_decode_plane(l, p->data[0] + 1, avctx->width, avctx->height, decoded = loco_decode_plane(l, p->data[0] + 1, avctx->width, avctx->height,
p->linesize[0], buf, buf_size, 4); p->linesize[0], buf, buf_size, 4);
if (decoded >= buf_size)
goto buf_too_small;
buf += decoded; buf_size -= decoded; buf += decoded; buf_size -= decoded;
decoded = loco_decode_plane(l, p->data[0] + 2, avctx->width, avctx->height, decoded = loco_decode_plane(l, p->data[0] + 2, avctx->width, avctx->height,
p->linesize[0], buf, buf_size, 4); p->linesize[0], buf, buf_size, 4);
if (decoded >= buf_size)
goto buf_too_small;
buf += decoded; buf_size -= decoded; buf += decoded; buf_size -= decoded;
decoded = loco_decode_plane(l, p->data[0] + 3, avctx->width, avctx->height, decoded = loco_decode_plane(l, p->data[0] + 3, avctx->width, avctx->height,
p->linesize[0], buf, buf_size, 4); p->linesize[0], buf, buf_size, 4);
break; break;
@@ -227,6 +254,9 @@ static int decode_frame(AVCodecContext *avctx,
*(AVFrame*)data = l->pic; *(AVFrame*)data = l->pic;
return buf_size; return buf_size;
buf_too_small:
av_log(avctx, AV_LOG_ERROR, "Input data too small.\n");
return AVERROR(EINVAL);
} }
static av_cold int decode_init(AVCodecContext *avctx){ static av_cold int decode_init(AVCodecContext *avctx){