From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3A6E642339 for ; Tue, 12 Apr 2022 08:17:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED36568B3BB; Tue, 12 Apr 2022 11:15:58 +0300 (EEST) Received: from out203-205-221-240.mail.qq.com (out203-205-221-240.mail.qq.com [203.205.221.240]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8605668B2AE for ; Tue, 12 Apr 2022 11:15:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1649751344; bh=4zcEWou2tCvuTarfMJWotf0hEwKFwdcQ+OHcPjY6EX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LQaGLUn/P+7vbiBpSTxICN0DprnqzLyxadi4Cry3HclrrQDIlSJtPOb+FaRbBreVR 7qWjn1wW97RMxlBosNJN1qReZ78XtxzN0NAZ9wuYbOzFUbWj5OeLMzBBLC/55H3c8A 03PxOtAcQ2SA5TAAgw3+tsbDiuG7p2hhMnBslSoc= 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: xmsmtpt1649751344tfg5omam4 Message-ID: X-QQ-XMAILINFO: NC/J3CrDtaBbMRlk7BldDasSotUm60XrPTb3RsXhEFg7/elRRkIx8fs/aUwqCb MR+w3XAK3Gx0p5jC5UOWqvQUfp7kP9qgb5IICsjeU/xbIXDulQzxHusXWWfZCrvjWTQQQ6JBxwxo 3mE+pRwz4LOWBAXPXW+Vu4mBDcDkNu0j0yRbvLHQAvnK6MwBdNU1/4ZCbHgeE/wzWoIxuQflI2N8 yJXi4B5MeEUhGyN/BnxAaowx/QGFOGd8L5w3/qTryUzCIZVnrYA/XZnW18UifA570gQ/n9nqAN5X T2jFf2Ui9qkLT7OhbHl0h1c+CNjfA3shpp/dnycSNaI3P+KF/IT9cJhCR2ziSEXLVwnePkMEIQ6w tv/56dFeWt9+Tee2ALyk4ZiqzsDfhbSYy1FMmXB/dUJtTIjfF/s8BC/W43GPTloqmhlq1CW/YFZo agZBoQrkghLSkoG8MHoSQqCMQIscg6ZPxZZeT3P5BCV4iT7LlgcL7HgAyvjUpGJDuKgtnw1ip2hR Jl6tkjmX8h6vSCAW4oUT7tQ3PhCUCQ4BD7Rvx2BbOpuXbKcKSAqtPdkHMkfgDcS34Ktsw2SqLQoX oBYPBVqiUs8u6/eAWd4Ii7iQqQ2DK9SykgyiK2z/0/ehrZDVEMYGcJg7phqE6Be3sRkiKLPSGGe8 dvmhOWlZSQIK7rlku4DUmaysg8n3TcZ2h/FQEPzq1/8ep06CXVDa3qBuzw8+Ppph1+e5NGnIUpKh sUWBkL7JPRRvT8M/zSkXo6ENfA1yOoaR+fGZ0tZWu4M35GrxB3UrxsOqGJSyG4dx/BG+ZYob2Yvj /I+gbIRiO0GHYr6X3+TW/WXX1HDG8DFJQ8ugpBSAU+IyOYtgmlSyjnZmQBtLgEQayoA5CLqnXIlr jlC42vBW1h8vP1Wg3EZsqYUt0uWvw0wOXFgenp323J8n4wavTMyWL31ECau2jediDA/IQ5RL3HqS Vsz/nObeJ9DW91voc/6g== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 16:15:20 +0800 X-OQ-MSGID: <20220412081522.43246-8-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 08/10] avformat/hls: fix leak of segments when dynarray_add fail 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavformat/hls.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 65937120d5..b9e2e8a04d 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1024,7 +1024,12 @@ static int parse_playlist(HLSContext *c, const char *url, } seg->duration = duration; seg->key_type = key_type; - dynarray_add(&pls->segments, &pls->n_segments, seg); + if (av_dynarray_add_nofree(&pls->segments, &pls->n_segments, + seg) < 0) { + free_segment(seg); + ret = AVERROR(ENOMEM); + goto fail; + } is_segment = 0; seg->size = seg_size; -- 2.31.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".