From patchwork Tue Apr 12 08:15:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 35281 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1454416pzh; Tue, 12 Apr 2022 01:16:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxrg7BngY2foqGakFJzyB8PgCqkrnopwyYYPQAekMzaosqk9CH0RJ1UN68BjQ5r341fyhis X-Received: by 2002:a17:906:7948:b0:6da:64ed:178e with SMTP id l8-20020a170906794800b006da64ed178emr34797185ejo.523.1649751391505; Tue, 12 Apr 2022 01:16:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649751391; cv=none; d=google.com; s=arc-20160816; b=FcOYcIaPjai6IShk3XS5JCmznDUYvnCL1bYJKmqIf3cStZ6U2jXhDbevY26cHgAWsd g15sVLaMw4Etxixo4yc+WJqUQKbBcru+G7Ub9S8nhTN367+xUwEraj2tfsaQccoYXpkD uwMikUpA4RPVsr4FAyoyue6HHp8P5BZXq4qiinmKgB6u1PuZF1v5eqeKFoW1ujwY7QK9 GrxfvUFGvkxFMqV++fD5LRDjFV+RnUpGyAEy59J6rrGlogvORJ4/e8+Q+tRLoaHTg8lv EIYdM/T9CL+OM5AnEIou5/1uZcFLUQQbgv7kvs/A3vMC36h8jgYJ00QTTkuQ+aaDUUfn Nc0g== 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=MyxLf+RG7qSWPxL7zmvsLIf3B7r94UcPAH62lUNm+xg=; b=IQszhTFXjqLVvs0iwwbtJWia1lkqEqBBGqsy1zzyd+PLmR4gKgtLUOFo+SMrc0O9QV EAope2cUPxAuMqEAYHRGJpudq6/grJvhyxBGMgKQFtRCN7eoLpX9ImIWQvUAWZmMltB4 ObeSS1xirAXAqvxkml865Gao+crlCR2gNUQ0XVRMfsr985uzJJoAjJ6ONrJIaqfgIqw1 Ptntl5+ZFVx3i2wSKUGmgEaTK/KqIALgs2HMRNpTGZ7LECRmlbvFip09A43esRxJnfB5 ZlyUcVkoN/OcDn/emkmb2qUn3HpEJN9Bqra24hAsFVhtvPP/Gu0SSsJII2WVl8kL957j kFnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=GbDtLJ3f; 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 w22-20020aa7cb56000000b00418c2b5bf16si8111231edt.504.2022.04.12.01.16.31; Tue, 12 Apr 2022 01:16:31 -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=GbDtLJ3f; 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 4FD3368B388; Tue, 12 Apr 2022 11:15:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-53.mail.qq.com (out203-205-251-53.mail.qq.com [203.205.251.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AC1668B21E for ; Tue, 12 Apr 2022 11:15:45 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1649751342; bh=45Zy7Y3L7QKqYsPDztR01l1mwDePEI55JbDjO5d6P7E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GbDtLJ3fNJNARFBTswmJspTt9zMjQPU4e2H18pFAnogJA19Yvd6KSpqGUjZ+NJnZ4 JtAXXP8iRKtC5HYgP72Mh32FOaTGAd8ZpKgVgkxyhlCsn715H7nEEm9AISqiycHBlF P4a6tr2YGgWG0FzKIBPksYH3B4mlKj4++sj5IlPk= 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: xmsmtpt1649751341tmuijrk91 Message-ID: X-QQ-XMAILINFO: MmCmH9jyqHC2EOW9AyDqpg1e547gLnZhioPgpkamv2C0h0oxQdqtTF4HDCsA4i CmL9Q+SDDNLhT+q9ZwJe+Pv2iAFnQtcsPoSW7iJkBavkFF+WlnetfQm676p9HYNiv73XxXtJw8lO WaampsZu/L6QauXQd9pBm06rC4sZkne+jYInOija6gcGPptEtjnm1A7glwxgh+Zz3IbEL/FB2IMw TgKnS+JHFWQ5Omd0LFA/QCtlRxzxZD6Y+uDA4h9qoCDTXIPMeR4sc14Dgso7HZEoW/3ICg8duLnC E8xe54K0AjRnYyq283WK135SJj0/qjQImapoIcArmFQ6tYghsCSGaZ7Zov/mZN7bCtOzYO2ia6PM /HR9aAqRFLCq7VX18W+/C7+G+nl8L0O0yhT5imDy/p0iwhTGDe9/GX3rX2d8pJUFgmgMzYddxMfh Z7zCI73eBdV0fyYEEwzgcIRCvnM44n3Rw7cAHMbp538KTtDpCoQ5ok8GoOi9rQgrZDKJEoqb5CDO IePSmkS+VsBAk1L499r7KtSSco5KurW15wnwQjvcETYZgjeBS55UTIukRaW35RGT9S8BcMP3Y6ED +dSeaBnt/2y+aJEpdrYcJnCJ6GQOZXEX4WVcZKfz59Gyob451/Ir4eZLVSoCmorLUlUEVNa0S+11 8SKUB0aNNiQ23ZU+wrhbuKMQ0x1VimsI87rPuVvKTPX72Pmx+uDITQCIVE1Jsj4zj3mlkWISSS9z uqjB9zI1fG9YQy8MvOJysRkjYBmkCqLuPCC5KCbdiynN70tmUpP4/MSPjUuOkH4kzCOdKq5bSuDF Ew71nGYa/CDpN0ZH1MZHcRhnkGJP6vMHzmbpCZ76ZzYY0ToKTRmYsW/auVaP+SAtSNq0uJkL2HON uGDAYPirThM+Y1M3iT1sXGdgydAUWDo/cL5Zmz5DZfTCV1mtohK1Wp5GdQyYlaVHK/8IpOD43OC8 heoStjz+7OFHeRQgGFAQ== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 16:15:16 +0800 X-OQ-MSGID: <20220412081522.43246-4-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 04/10] avformat/hls: fix leak of playlist 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +WunmLYZhsn4 --- libavformat/hls.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index ecb6237d2e..d5c3009d07 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -330,7 +330,10 @@ static struct playlist *new_playlist(HLSContext *c, const char *url, pls->is_id3_timestamped = -1; pls->id3_mpegts_timestamp = AV_NOPTS_VALUE; - dynarray_add(&c->playlists, &c->n_playlists, pls); + if (av_dynarray_add_nofree(&c->playlists, &c->n_playlists, pls) < 0) { + free_playlist(c, pls); + return NULL; + } return pls; }