avformat/mpeg: Add padding to extradata
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
Tue, 22 Oct 2019 13:16:42 +0000 (15:16 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 24 Oct 2019 17:45:17 +0000 (19:45 +0200)
Extradata is supposed to be padded with AV_INPUT_BUFFER_PADDING_SIZE bytes,
yet the VobSub demuxer used av_strdup for the allocation of extradata.
This has been changed.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mpeg.c

index c33401f..3750de6 100644 (file)
@@ -769,7 +769,7 @@ static int vobsub_read_header(AVFormatContext *s)
         goto end;
     }
 
-    av_bprint_init(&header, 0, AV_BPRINT_SIZE_UNLIMITED);
+    av_bprint_init(&header, 0, INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE);
     while (!avio_feof(s->pb)) {
         char line[MAX_LINE_SIZE];
         int len = ff_get_line(s->pb, line, sizeof(line));
@@ -896,14 +896,12 @@ static int vobsub_read_header(AVFormatContext *s)
     }
     av_bprint_finalize(&header, &header_str);
     for (i = 0; i < s->nb_streams; i++) {
-        AVStream *sub_st = s->streams[i];
-        sub_st->codecpar->extradata      = av_strdup(header_str);
-        if (!sub_st->codecpar->extradata) {
-            ret = AVERROR(ENOMEM);
-            sub_st->codecpar->extradata_size = 0;
+        AVCodecParameters *par = s->streams[i]->codecpar;
+        ret = ff_alloc_extradata(par, header.len);
+        if (ret < 0) {
             goto end;
         }
-        sub_st->codecpar->extradata_size = header.len;
+        memcpy(par->extradata, header_str, header.len);
     }
 end: