From patchwork Sun Nov 6 21:44:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anssi Hannula X-Patchwork-Id: 1319 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp835569vsb; Sun, 6 Nov 2016 13:52:28 -0800 (PST) X-Received: by 10.194.32.100 with SMTP id h4mr2824143wji.116.1478469148729; Sun, 06 Nov 2016 13:52:28 -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 ju1si26241072wjc.128.2016.11.06.13.52.28; Sun, 06 Nov 2016 13:52:28 -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 284F268922D; Sun, 6 Nov 2016 23:52:16 +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 A0989687ED2 for ; Sun, 6 Nov 2016 23:52:09 +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 181C624F91 for ; Sun, 6 Nov 2016 23:44:30 +0200 (EET) Received: by mail.onse.fi (Postfix, from userid 501) id E4C9140EDD; Sun, 6 Nov 2016 23:44:29 +0200 (EET) From: Anssi Hannula To: ffmpeg-devel@ffmpeg.org Date: Sun, 6 Nov 2016 23:44:15 +0200 Message-Id: <1478468655-2874-4-git-send-email-anssi.hannula@iki.fi> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478468655-2874-1-git-send-email-anssi.hannula@iki.fi> References: <1478468655-2874-1-git-send-email-anssi.hannula@iki.fi> Subject: [FFmpeg-devel] [PATCH 3/3] 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Anssi Hannula --- libavformat/hls.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index ce52bf5..a744908 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) + 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) + return err; } return 0;