From patchwork Sun Nov 6 22:52:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anssi Hannula X-Patchwork-Id: 1320 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp850941vsb; Sun, 6 Nov 2016 14:52:51 -0800 (PST) X-Received: by 10.28.150.20 with SMTP id y20mr6044014wmd.67.1478472771427; Sun, 06 Nov 2016 14:52:51 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f18si7469220wmh.77.2016.11.06.14.52.50; Sun, 06 Nov 2016 14:52:51 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 013CF689218; Mon, 7 Nov 2016 00:52:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from webmail.tpnet.fi (webmail.tpnet.fi [62.106.63.33]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B80F687ED2 for ; Mon, 7 Nov 2016 00:52:38 +0200 (EET) Received: from mail.onse.fi (host-109-204-145-182.tp-fne.tampereenpuhelin.net [109.204.145.182]) by webmail.tpnet.fi (Postfix) with ESMTPS id 8D7A124CB9; Mon, 7 Nov 2016 00:52:41 +0200 (EET) Received: by mail.onse.fi (Postfix, from userid 501) id 6E86640EB2; Mon, 7 Nov 2016 00:52:41 +0200 (EET) From: Anssi Hannula To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Nov 2016 00:52:20 +0200 Message-Id: <1478472740-2501-1-git-send-email-anssi.hannula@iki.fi> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH 3/3 v2] avformat/hls: Add missing error check for avcodec_parameters_copy() 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 Cadhalpun MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Anssi Hannula --- 07.11.2016, 00:35, Andreas Cadhalpun kirjoitti: > On 06.11.2016 22:44, Anssi Hannula wrote: >> Signed-off-by: Anssi Hannula >> --- >> libavformat/hls.c | 18 ++++++++++++++---- >> 1 file changed, 14 insertions(+), 4 deletions(-) >> > > This misses checking the return code of the other occurrence of > set_stream_info_from_input_stream in hls_read_packet. Argh, true. Here's a new one. libavformat/hls.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index ce52bf5..2bf86fa 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1528,9 +1528,13 @@ static void add_stream_to_programs(AVFormatContext *s, struct playlist *pls, AVS av_dict_set_int(&stream->metadata, "variant_bitrate", bandwidth, 0); } -static void set_stream_info_from_input_stream(AVStream *st, struct playlist *pls, AVStream *ist) +static int set_stream_info_from_input_stream(AVStream *st, struct playlist *pls, AVStream *ist) { - avcodec_parameters_copy(st->codecpar, ist->codecpar); + int err; + + err = avcodec_parameters_copy(st->codecpar, ist->codecpar); + if (err < 0) + return err; if (pls->is_id3_timestamped) /* custom timestamps via id3 */ avpriv_set_pts_info(st, 33, 1, MPEG_TIME_BASE); @@ -1538,11 +1542,15 @@ static void set_stream_info_from_input_stream(AVStream *st, struct playlist *pls avpriv_set_pts_info(st, ist->pts_wrap_bits, ist->time_base.num, ist->time_base.den); st->internal->need_context_update = 1; + + return 0; } /* add new subdemuxer streams to our context, if any */ static int update_streams_from_subdemuxer(AVFormatContext *s, struct playlist *pls) { + int err; + while (pls->n_main_streams < pls->ctx->nb_streams) { int ist_idx = pls->n_main_streams; AVStream *st = avformat_new_stream(s, NULL); @@ -1552,11 +1560,13 @@ static int update_streams_from_subdemuxer(AVFormatContext *s, struct playlist *p return AVERROR(ENOMEM); st->id = pls->index; - set_stream_info_from_input_stream(st, pls, ist); - dynarray_add(&pls->main_streams, &pls->n_main_streams, st); add_stream_to_programs(s, pls, st); + + err = set_stream_info_from_input_stream(st, pls, ist); + if (err < 0) + return err; } return 0; @@ -1990,8 +2000,13 @@ static int hls_read_packet(AVFormatContext *s, AVPacket *pkt) /* There may be more situations where this would be useful, but this at least * handles newly probed codecs properly (i.e. request_probe by mpegts). */ - if (ist->codecpar->codec_id != st->codecpar->codec_id) - set_stream_info_from_input_stream(st, pls, ist); + if (ist->codecpar->codec_id != st->codecpar->codec_id) { + ret = set_stream_info_from_input_stream(st, pls, ist); + if (ret < 0) { + av_packet_unref(pkt); + return ret; + } + } return 0; }