Merge commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8'

* commit '2383323661f3b8342b2c4d356fcfe8c5d1b045f8':
  dvbsubdec: improve error checking

Conflicts:
	libavcodec/dvbsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dvbsubdec.c
index 021f943,839465b..c45d568
--- 1/libavcodec/dvbsubdec.c
--- 2/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@@ -757,98 -723,7 +757,111 @@@ static int dvbsub_read_8bit_string(uint
      return pixels_read;
  }
  
 +static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_output)
 +{
 +    DVBSubContext *ctx = avctx->priv_data;
 +    DVBSubRegionDisplay *display;
 +    DVBSubDisplayDefinition *display_def = ctx->display_definition;
 +    DVBSubRegion *region;
 +    AVSubtitleRect *rect;
 +    DVBSubCLUT *clut;
 +    uint32_t *clut_table;
 +    int i;
 +    int offset_x=0, offset_y=0;
 +
 +
 +    if (display_def) {
 +        offset_x = display_def->x;
 +        offset_y = display_def->y;
 +    }
  
 +    /* Not touching AVSubtitles again*/
 +    if(sub->num_rects) {
 +        avpriv_request_sample(ctx, "Different Version of Segment asked Twice\n");
 +        return AVERROR_PATCHWELCOME;
 +    }
 +    for (display = ctx->display_list; display; display = display->next) {
 +        region = get_region(ctx, display->region_id);
 +        if (region && region->dirty)
 +            sub->num_rects++;
 +    }
 +
 +    if(ctx->compute_edt == 0) {
 +        sub->end_display_time = ctx->time_out * 1000;
 +        *got_output = 1;
 +    } else if (ctx->prev_start != AV_NOPTS_VALUE) {
 +        sub->end_display_time = av_rescale_q((sub->pts - ctx->prev_start ), AV_TIME_BASE_Q, (AVRational){ 1, 1000 }) - 1;
 +        *got_output = 1;
 +    }
 +    if (sub->num_rects > 0) {
 +
 +        sub->rects = av_mallocz_array(sizeof(*sub->rects), sub->num_rects);
++        if (!sub->rects)
++            return AVERROR(ENOMEM);
++
 +        for(i=0; i<sub->num_rects; i++)
 +            sub->rects[i] = av_mallocz(sizeof(*sub->rects[i]));
 +
 +        i = 0;
 +
 +        for (display = ctx->display_list; display; display = display->next) {
 +            region = get_region(ctx, display->region_id);
 +
 +            if (!region)
 +                continue;
 +
 +            if (!region->dirty)
 +                continue;
 +
 +            rect = sub->rects[i];
 +            rect->x = display->x_pos + offset_x;
 +            rect->y = display->y_pos + offset_y;
 +            rect->w = region->width;
 +            rect->h = region->height;
 +            rect->nb_colors = (1 << region->depth);
 +            rect->type      = SUBTITLE_BITMAP;
 +            rect->pict.linesize[0] = region->width;
 +
 +            clut = get_clut(ctx, region->clut);
 +
 +            if (!clut)
 +                clut = &default_clut;
 +
 +            switch (region->depth) {
 +            case 2:
 +                clut_table = clut->clut4;
 +                break;
 +            case 8:
 +                clut_table = clut->clut256;
 +                break;
 +            case 4:
 +            default:
 +                clut_table = clut->clut16;
 +                break;
 +            }
 +
 +            rect->pict.data[1] = av_mallocz(AVPALETTE_SIZE);
++            if (!rect->pict.data[1]) {
++                av_free(sub->rects);
++                return AVERROR(ENOMEM);
++            }
 +            memcpy(rect->pict.data[1], clut_table, (1 << region->depth) * sizeof(uint32_t));
 +
 +            rect->pict.data[0] = av_malloc(region->buf_size);
++            if (!rect->pict.data[0]) {
++                av_free(rect->pict.data[1]);
++                av_free(sub->rects);
++                return AVERROR(ENOMEM);
++            }
++
 +            memcpy(rect->pict.data[0], region->pbuf, region->buf_size);
 +
 +            i++;
 +        }
 +    }
 +
 +    return 0;
 +}
  
  static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDisplay *display,
                                            const uint8_t *buf, int buf_size, int top_bottom, int non_mod)