From patchwork Wed Aug 31 02:45:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37569 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp90003pzh; Tue, 30 Aug 2022 19:45:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR6v8M7IkJg6idnACMgPSquY68a8Ez4BMPWksZcgtdp5slNs7CusRE8SIl0cidFhDEs/a2m0 X-Received: by 2002:a05:6402:894:b0:447:fe25:15cf with SMTP id e20-20020a056402089400b00447fe2515cfmr17158587edy.404.1661913939080; Tue, 30 Aug 2022 19:45:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661913939; cv=none; d=google.com; s=arc-20160816; b=nGxIDAONmSSCPhxNkxZRCWUTAq1U1N3utzp4W+lYvTFCDW87hY/i0ZSuKHS0w2M6hP BA3jWpvZaEoKf7MVTxqurQMVw766X457vAHGndyvkCYEMI8j+l6JHmWB3j8P/ryRvHOl /L4GN0W1fakH5WqAQBT9EFzoRqkNLdD6hAVNMHPd4YGqbvxIulCWdByoVZvCHFq991Kn tzsoaq/hZnQ3USoA9BGQvGrv0HYbhRF0Gf57t+2UXu+/9aaWLD1e3ebQJRZjwUZLrl1+ ha6f997SGzO7MMhOMkK02OpZ9ODBzgwT52kteIxw6wCD+yV1Em8QNRXcwKb6gMFLNJv0 nzGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=LX2H1kkGUQbKZcGMRLXOAJhsD/DdV72NMi+e3KVN83s=; b=XiI4qze4m1xBaZNuNoz+nf/JxtTT8KYNBp30RlOmNhF9S/eVBPzhzndOY9IWLHJ+cz 5GHM1o24JwT9yClnzhZaSHvq0caqm5EYaBOC+qG765JDJ3+tEijmEXygSO2jBzFQgSLn JQv4Q76jat70zNiUNsPRdA1ozDgcfHv70f2MXE2CQpVJT/gghvU+gRcoRsrElj/Wn+4Q unnv+Xfe+bkHJ1Ayy1YK79zlxmpizmXt4gt6UqXZXKUcm8tP7PNpVqpKgOHIjGzjhKly YvzhLPmpWg77MJFVKmPFlx/WlQu07PDsPo+HLOwCFnGokblbqIHBuI3H3aImqDoSrSG0 Phrw== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m14-20020a056402510e00b00446ba684e2asi5439942edd.367.2022.08.30.19.45.36; Tue, 30 Aug 2022 19:45:39 -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; 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 DD1A668BB0A; Wed, 31 Aug 2022 05:45:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1EA6F68B99B for ; Wed, 31 Aug 2022 05:45:26 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 726E7240D0E for ; Wed, 31 Aug 2022 04:45:25 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id qtdvg95qv5zY for ; Wed, 31 Aug 2022 04:45:24 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 27E79240D03 for ; Wed, 31 Aug 2022 04:45:24 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 2EC623A0ABF; Wed, 31 Aug 2022 04:45:18 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Aug 2022 04:45:15 +0200 Message-Id: <20220831024515.16191-1-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/mov: avoid leaks with multiple dv-audio streams 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: C8nucyD9BSxk --- libavformat/mov.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index a2b429e52f..f433746192 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2430,6 +2430,11 @@ static int mov_finalize_stsd_codec(MOVContext *c, AVIOContext *pb, switch (st->codecpar->codec_id) { #if CONFIG_DV_DEMUXER case AV_CODEC_ID_DVAUDIO: + if (c->dv_fctx) { + avpriv_request_sample(c->fc, "multiple DV audio streams"); + return AVERROR(ENOSYS); + } + c->dv_fctx = avformat_alloc_context(); if (!c->dv_fctx) { av_log(c->fc, AV_LOG_ERROR, "dv demux context alloc error\n");