On 09.11.2016 23:27, Andreas Cadhalpun wrote:
> Rects with positive w/h/linesize but no data are invalid.
>
> Signed-off-by: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
> ---
> libavcodec/pgssubdec.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c
> index cef477d..b50b37b 100644
> --- a/libavcodec/pgssubdec.c
> +++ b/libavcodec/pgssubdec.c
> @@ -556,12 +556,13 @@ static int display_end_segment(AVCodecContext *avctx,
> void *data,
>
> sub->rects[i]->x = ctx->presentation.objects[i].x;
> sub->rects[i]->y = ctx->presentation.objects[i].y;
> - sub->rects[i]->w = object->w;
> - sub->rects[i]->h = object->h;
> -
> - sub->rects[i]->linesize[0] = object->w;
>
> if (object->rle) {
> + sub->rects[i]->w = object->w;
> + sub->rects[i]->h = object->h;
> +
> + sub->rects[i]->linesize[0] = object->w;
> +
> if (object->rle_remaining_len) {
> av_log(avctx, AV_LOG_ERROR, "RLE data length %u is %u bytes
> shorter than expected\n",
> object->rle_data_len, object->rle_remaining_len);
>
Ping. I intend to apply this in a few days.
Best regards,
Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
