From patchwork Sat Jul 20 22:08:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 14009 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 93384447C83 for ; Sun, 21 Jul 2019 01:10:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7EE4168ACA0; Sun, 21 Jul 2019 01:10:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-1.mx.upcmail.net (vie01a-dmta-pe08-1.mx.upcmail.net [84.116.36.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A46068ABB1 for ; Sun, 21 Jul 2019 01:10:15 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1hoxYU-0004ip-6I for ffmpeg-devel@ffmpeg.org; Sun, 21 Jul 2019 00:10:14 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id oxXVhyGIi5D5NoxXVhsXKQ; Sun, 21 Jul 2019 00:09:14 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=bu8y+3Si c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=b6shecHQWYbd-Ubo8wcA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 21 Jul 2019 00:08:53 +0200 Message-Id: <20190720220856.17516-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfDJHj6/7C74/oBqMl5nZK9qCwUPP4qYRjGAuUlI0uTLO2u8aJijUnP0L7EaczwjhWAQ1UEM9fYkRRCIOl8/Q1FtG3Ee+yx0ex2zdn55YojM1NQeTR6df ZuPEB9q3LON6qyM0ilcAPweOY0NqeXWZgOJIHKXXgbT27IiZbrD0W+Io Subject: [FFmpeg-devel] [PATCH 1/4] avformat/vividas: forward errors from track_header() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Michael Niedermayer --- libavformat/vividas.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index 184d24f374..1895c75858 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -273,7 +273,7 @@ static uint8_t *read_sb_block(AVIOContext *src, unsigned *size, return buf; } -static void track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t *buf, int size) +static int track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t *buf, int size) { int i,j; int64_t off; @@ -283,7 +283,7 @@ static void track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t pb = avio_alloc_context(buf, size, 0, NULL, NULL, NULL, NULL); if (!pb) - return; + return AVERROR(ENOMEM); ffio_read_varlen(pb); // track_header_len avio_r8(pb); // '1' @@ -380,7 +380,7 @@ static void track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t st->codecpar->extradata_size = 64 + xd_size + xd_size / 255; if (ff_alloc_extradata(st->codecpar, st->codecpar->extradata_size)) - return; + return AVERROR(ENOMEM); p = st->codecpar->extradata; p[0] = 2; @@ -404,6 +404,7 @@ static void track_header(VividasDemuxContext *viv, AVFormatContext *s, uint8_t } av_free(pb); + return 0; } static void track_index(VividasDemuxContext *viv, AVFormatContext *s, uint8_t *buf, unsigned size) @@ -506,6 +507,7 @@ static int viv_read_header(AVFormatContext *s) uint32_t b22_size = 0; uint32_t b22_key = 0; uint8_t *buf = 0; + int ret; avio_skip(pb, 9); @@ -561,8 +563,10 @@ static int viv_read_header(AVFormatContext *s) buf = read_vblock(pb, &v, key, &k2, 0); if (!buf) return AVERROR(EIO); - track_header(viv, s, buf, v); + ret = track_header(viv, s, buf, v); av_free(buf); + if (ret < 0) + return ret; buf = read_vblock(pb, &v, key, &k2, v); if (!buf)