Browse Source

pgssubdec: only set w/h/linesize when allocating data

Rects with positive w/h/linesize but no data are invalid.

Reviewed-by: Petri Hintukainen <phintuka@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
tags/n3.3
Andreas Cadhalpun 9 years ago
parent
commit
995512328e
1 changed files with 5 additions and 4 deletions
  1. +5
    -4
      libavcodec/pgssubdec.c

+ 5
- 4
libavcodec/pgssubdec.c View File

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


Loading…
Cancel
Save