From patchwork Tue Oct 22 13:16:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15899 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 21A1F448B82 for ; Tue, 22 Oct 2019 16:17:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E7F768AEEC; Tue, 22 Oct 2019 16:17:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C963B68AEB0 for ; Tue, 22 Oct 2019 16:17:13 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id o28so18033433wro.7 for ; Tue, 22 Oct 2019 06:17:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gdPy5pv0+1l1UPO/V4aA9AyQ3ukS6z5TgtIKkpIh3LI=; b=CM6WzSV0Haawprwv9stBOiaNjgi2ZRGEvjJ2mwqu8oJPAzy156fg0h9pEx4P5tIo+K nMvZ+G5Lr0tbX1xoP54EgIyhd+MJnk2I6q2wbKbzmbDbJY4+vXPSOC1LSQDe5lZHib0O Y5P5W477vSBEhZfa7rCGcq3T2/p+8+1m6o8em5IDg68KrGKxQ0dHHiwiGC7eaRnMplig C8psM3dpP+Yk/mgoQq3FHLFi9zt6yIH50bQIXTgaYa8JQq3DcdLV3Fs7TZrDXccDKznj A91Yb5dDe/Zue5c4CnuW15fRKnmjeA7sPsKPUMZaVJCxguPhmSANfXTgnjbOLQSQ446S /iBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gdPy5pv0+1l1UPO/V4aA9AyQ3ukS6z5TgtIKkpIh3LI=; b=rC6TdTfcUmmQyDnGLkcdso8Phd6lItVehmFLImui4+DFAFatYs3z7FmtiIWnIyHp7J fdQXQvuZgX4eVdbxRdTekxiHsWvk8kccbsezF7DRDJCDVyuTH3EZnafI91cA2O6DYB35 qD2anAuJ1z86SShcGiFK/UdPvd/r819s46S/tfjuFd02ht0FHvf90zDM1aUjP4Dunbrr d6gX0AvcGSAllJ4LiwzXiSMh/FdPbSZ4ycKoiGLTYte5GtpRnjckSBQPqSfOVt1W953d 4TIxOCmJG1yIeXI0ckEnjo+cPY+PPlU7PVW7Lj70Ygn2w7+tcvdm4Sui8Ivj67ya8mwu VYLQ== X-Gm-Message-State: APjAAAV2UJ/pNOmQDmJ77oWOOJ5Up/v+mJD0mCuMKDm5/eCzKKcGOItc H4N6vxpJJun94YQ36RElaHkdxRV2 X-Google-Smtp-Source: APXvYqw80eRWcCDbttD8QUKeNRf2TwFdVZaPteeN8Un0/HpfMP1L7hUYVa2RNBIM3qQRqdYyHqHHuA== X-Received: by 2002:adf:8526:: with SMTP id 35mr3793378wrh.266.1571750233096; Tue, 22 Oct 2019 06:17:13 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id o70sm25074520wme.29.2019.10.22.06.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:17:12 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Oct 2019 15:16:42 +0200 Message-Id: <20191022131645.8394-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191022131645.8394-1-andreas.rheinhardt@gmail.com> References: <20191022131645.8394-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] avformat/mpeg: Add padding to extradata X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 --- I did not change the extradata_size in order to explicitly include a zero byte; i.e. the first byte of the padding is the zero byte ending the string. This is just like now. libavformat/mpeg.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index ebc064931a..46c59163fd 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -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: