From patchwork Thu Oct 10 03:40:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 15660 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 D57DE44A020 for ; Thu, 10 Oct 2019 06:40:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C16696881AE; Thu, 10 Oct 2019 06:40:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpproxy21.qq.com (smtpbg704.qq.com [203.205.195.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F5796881D3 for ; Thu, 10 Oct 2019 06:40:37 +0300 (EEST) X-QQ-mid: bizesmtp20t1570678830t7al0ua3 Received: from localhost (unknown [47.90.47.25]) by esmtp6.qq.com (ESMTP) with id ; Thu, 10 Oct 2019 11:40:29 +0800 (CST) X-QQ-SSF: 01100000002000K0ZRF1000A0000000 X-QQ-FEAT: JVNuYs5bneP8a5XFvJHK7+tn/dWB2rJp5ih34WdZXsCDKAASHDqlxgsf7Ejef z007dh99k/U7EuXdyjCCc13toNUKjf5cCsRvoGBluThaGW5Teamgta27MplxWCKGuC4rxfH eRPEnXiUAvm+YKSJLJWgV3sGoatbcudYAMuTdXN95UXb6vWkJrfyQLQaEKclm7F9GKO8rwD yOdvpTc6N9eG8kfDDwAE77hPCNgZRys1UdC8fxiFnxktq6yeT4r0jGSyf5VAqb8QYwgxaG9 Z1JuiurcC/u/xlLpN2/pXIMxw3jt7aXkgwyZGcEApIJgn8Gfq7nSH7KkjhalO4UKpe3qOfz crCH1iO X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Oct 2019 11:40:08 +0800 Message-Id: <20191010034011.1205-5-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty In-Reply-To: <20191010034011.1205-1-lq@chinaffmpeg.org> References: <20191010034011.1205-1-lq@chinaffmpeg.org> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v1 5/8] avformat/mpeg: check av_strdup() return value 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavformat/mpeg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index bd182e4429..df37692f12 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -898,6 +898,11 @@ static int vobsub_read_header(AVFormatContext *s) 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; + goto end; + } sub_st->codecpar->extradata_size = header.len; } av_free(header_str);