From patchwork Tue Apr 12 08:15:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 35287 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1454721pzh; Tue, 12 Apr 2022 01:17:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+eO2fTitmTNRzTvZtrbqjs/bBj5mUfDDBoU8rGqrIR1U/pXyiElRvzm7o5Fw+Qpl1LFU6 X-Received: by 2002:a17:907:6e04:b0:6e0:95c0:47b8 with SMTP id sd4-20020a1709076e0400b006e095c047b8mr33710244ejc.483.1649751452355; Tue, 12 Apr 2022 01:17:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649751452; cv=none; d=google.com; s=arc-20160816; b=r5RAx8Ts6h+nzZxboBPQAUyETRJC134BqUuhY78R9LIba2Abiy3jh2xH6qXFEzYPXh F/if0BehOuN7620A6yMpMDFSS75fyGTLfUSZqAGL7eCBzofzbGLTh5ClVcRM95yR4G+i A8y9FbJ1rXRBLNG4dfYKNJjd1XsRvcN7QlBFHhw5EH/0WLf5bxnuOUNW9hdGRFP5+RYl I1jBgRRnn513fhGZeE/HJKY2A3SkjaCusdF9F+krEixhrVAWdW8NuPMLmvQOPbz6+fIO tn40ZD5Ub1EWWxiZyHAiI8cS/Apqq4+fBvrBcxWleCkOYMnVzINayU9bkC/GORzY56oB lnbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=Ln5fgukDdA6XIGwkYOuLgB8QPbgj6cQIqF/yB7XddLU=; b=J58P67pHqvTET88N2tO75tWAuE2vOPT7FBmXMZwQsceDiH5zaaZXN+Hetfy9NUztYN bzmF18ICbzJ4qF/U+SnS01NeAXegCtQCZEOTYeKaLSkQ19powNnjqKIxCm7rcSOGiaxQ 5iigLecWNmJcLbeBv6YuDXTCc42Hpk6u90zlRg+qrlPAGKbqrjf5Fsj83TGc8VRtrneI BJUcxhGyieYsyLh1y+jGn2T2DawMj65xxKKOem4B2oTZE7OITKLHnRzo21zNyUDuICSr vLlqT7vojKBHDkIm3pG1D1y3WAlwp7Mjkgq9igiHkte0wulHuagWz37XL+R9aVTWW42p 0HMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=k+lqutcD; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id go15-20020a1709070d8f00b006e7fe2ddfcdsi9217963ejc.428.2022.04.12.01.17.31; Tue, 12 Apr 2022 01:17:32 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=k+lqutcD; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 35D5D68B3CE; Tue, 12 Apr 2022 11:16:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-245.mail.qq.com (out203-205-221-245.mail.qq.com [203.205.221.245]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73A0968B39B for ; Tue, 12 Apr 2022 11:15:49 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1649751346; bh=HP7GmNQviZRCgVDjFqLg87r73xqYgJLzQdjZf5AtgqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=k+lqutcDa0aCJz4d6Gx5vlSd36oXPwKB8LxusgnYdLzxyKRGx8JZKwze/9cxiOdYv GKR9qayHwBOcQPhJPIZeJkez+2vZedn8ASqeJ6hBA645qcb9NLKKTcMYnhUmtiUbF5 y1Oqdmf2AVPohE6TTvGe3Sr5UjCelR+KOIx342yA= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.68]) by newxmesmtplogicsvrsza8.qq.com (NewEsmtp) with SMTP id 3E314CF9; Tue, 12 Apr 2022 16:15:35 +0800 X-QQ-mid: xmsmtpt1649751345t4kiieele Message-ID: X-QQ-XMAILINFO: OBfNkvzAyASsgGf+3tIOEI7e3njBoEx57eQeeNwTuf+gOSXoaMP7oSvax5uIev GdgKeNDjbyve1qiy8RXSZiyHdBpeN3n+MSGs9wlpMtC3eYx6ymUPGNPpdol9JYGF2kQDEMKJpAzZ Ed92NIs8m/4RgNvO4dRWOzECJLY8m/KwO4W9A8OTVyTiMbT5D+sCn1gV5AZQyUqWEllnocHVoWic ExWKN0gqbELbVj79mskCT6x9zu6ZgS8z5LY5PfjGx30QUYiicTG+HEDxdu3XDeyAsKZMjM6BhTyN aPSEaeTRZv0kTF8JLRh9RzYiyAri2aQ7FcPhn2kKBd97nr3z3RXKP7ExJWqEGfJ7l1nZ5wP2OkV7 7w59JXjOXtHBH9pVrCB+0cFooWX5QOXizphqBlNLnYMvDc26HS24kgA0oH040iDRUbSXm+Vy5Ii/ yZ8CCRdjO1HharDx3+VzXF7eTou4rvnm9Ps1AXcNv/W0xHb8ieM94nPoZSJqScevMTE87gK5+KYt LnpCsGMtcIKwhlK18M1f7wKYhG2o95BbY8TT2FsC/3Q3R9Mb3BkKvBf7VmnACdI+7XloGJoNW5cf unp/3mgahP78DR6jhtmuVmdQApOZCXZSMdyDJcSZEqqlgxeDtzHGvgzLU2gCgsHdj9AJ/i98G8zC xwEJFB2He/QOswqgMsDFbVzizoy1Y7xnJnbw5i4zK6zIs5L8UhJbnxtjMizV93Sjsgdpd7eEyaaU QSd0d7Ky71/3Uwb+QM76z4oRWFtlBdjaCTCtV+geRRrQXWQFcI9GFWrk7WGX6RzojhphX1uvO+27 eAqT0LXi/OCtuxQ0ymqpJ8vpqSOwYpkB3Pq6xDj9QD1j0kG+M74xGsgTzzs44naMzXO2Roh38zYx rhsR8FWgiGyvqIeqnmt5sLa8PohKlOzVVwlU03HAlMRAPLe95nj2QRVvggLy4n7wRm/OetlzGn From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 16:15:22 +0800 X-OQ-MSGID: <20220412081522.43246-10-quinkblack@foxmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220412081522.43246-1-quinkblack@foxmail.com> References: <20220412081522.43246-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/10] avformat/hls: check dynarray_add error when add stream X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vgeNgp91rvC9 --- libavformat/hls.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index c102e36f52..4ab565f8e0 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1882,7 +1882,10 @@ static int update_streams_from_subdemuxer(AVFormatContext *s, struct playlist *p return AVERROR(ENOMEM); st->id = pls->index; - dynarray_add(&pls->main_streams, &pls->n_main_streams, st); + err = av_dynarray_add_nofree(&pls->main_streams, &pls->n_main_streams, + st); + if (err < 0) + return err; add_stream_to_programs(s, pls, st);