From patchwork Tue Jun 21 06:46:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 36370 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp2050972pzb; Mon, 20 Jun 2022 23:48:01 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uf+/LfkEQ9n5XJ06kSWragwutgRxj3FyhmEApuBMQiZQY2DWdKu3FqhrnHjg4XA16j+C+b X-Received: by 2002:a05:6402:50f:b0:435:7996:e90f with SMTP id m15-20020a056402050f00b004357996e90fmr14097361edv.110.1655794081386; Mon, 20 Jun 2022 23:48:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655794081; cv=none; d=google.com; s=arc-20160816; b=hp9aQXT7Z4pU/M4RWxxjsPhgy8VxquqpHMsNV2IXjgi7n9KANowLn9W+LdvylXHmFn 94UTUeISMPQgLunekja16+R19BF1+l/Hh7pP8McSfmrxssh8DjvApQoch8tXSnL/z74m fQpYSXi3JpB9rHIP2iFU4ubW1rIWMXDOzIgET3yY+k8bqAIALJkN1R1KM1oe3weZaWA6 /LI/2SnJj/XQECaZTNguPABkLi72D3L5Wg8cHkdzHOlBxsJS34Pox6TMmMc+1fmOWz63 FfiueIxikicX4UHEc+kaawLk+u5yxMzqmSbSqRfK79QCreVh7o8PbrRlbzrVqui8B643 0sCw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=qrgnIMZxKHugV2yQ9zNtPKfRFtAo4nMCF3/GL53FHRM=; b=1E7jbSxr/0AqRvjgGSdZ7TqvmN5FsfnHAJLUOb1uCwVwKsSp9RVojlP9efoXLHemxv Uo+zZcGdndjlUVZ5BRl8slQCjh3Fu32TixGcPB51W1ctRgrFnP2kJQV3+7GtiJh0w1ap jv3GV/qtfEHseblw/tGnSKYAIo6TWhgl1Eq7RVG/F3I8uW4VDCj7rD/LiKN67DmxeT49 2Ugyish+AA2iA6YRe4PQ1eMV0PZOkOHDszRIA+algrJurWpLROjqPe7gz3VpL2U2Z3u4 0pMWRtsvBwfj8R9lvw3izglC/TeNliGq+c1vAI3KY1mBp1QzqISWIRlkiIBPB6GkWNO4 VeFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qDPlx0ki; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hv11-20020a17090760cb00b006df76385e6csi15241471ejc.780.2022.06.20.23.48.00; Mon, 20 Jun 2022 23:48:01 -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=@gmail.com header.s=20210112 header.b=qDPlx0ki; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 892B268B6B0; Tue, 21 Jun 2022 09:46:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7EC068B649 for ; Tue, 21 Jun 2022 09:46:45 +0300 (EEST) Received: by mail-lf1-f51.google.com with SMTP id j21so7628676lfe.1 for ; Mon, 20 Jun 2022 23:46:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=bH099dhZYI9uqdn/8sDYeksjgzgw9cAuU5G0EUDEpyE=; b=qDPlx0kiZHmRvpZHGlwDpRKqh6VfDf8HUr8Lp2xBDnjlqpiCRfmPqUC0z1UWgpsJtS RaJ3N9CsGFSwG3Vzyf7KmfGn+qUd0rj355WD9hCRZOpUAlHr6uPtDthN6DvPgpXiKDPv 9PbKazA+vfOBPw6YY8nJIItZ+T75t/AiuIIbgiwQ1mlQPxmB2249mToY+hpEldRjeap/ cuoJfaw8nORW6pNMRgWeaR7gVl4nQ0150ZgO1KvXP0ZqQgDoJrdUKwpf23mIco16PIQk ytaEow7gD8pC4AzTXe7tHAjqPejrvG3ZuHdp5bRFc6HkYGubELDpcjq8k0EJMU3lRFEu 5/XQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bH099dhZYI9uqdn/8sDYeksjgzgw9cAuU5G0EUDEpyE=; b=DBdsY4ORde/bJfrRM1t/Cksk4zRNcufOzxOCdN9tDtE2V7aMDeZpuqPuAZe9WPmWvj xAbWEfRYtdqcT1ggrQL1sZUxz2EIPLZaw9gfbvdoAs61CsnU1WOfdmQoKWx8BBYBfKOd MVwyWjAkDnzaScg3iV/5Ia2cvDczkBNm+AF0FS7jGpl9Rg6qXu/NceMSMxQ3WsE5G28I pM5edZ+LMCnepCEYJb1Gg0xyFfLCqPQBaS/MSncaQtqqEMhGgoWgy01bjeVlOZI9b7fl /Nu2XrgFMH2HFcYFUkZwmj29DTpoUOjqYj018O8fTFUtLvqxWXFaZ/SMV/KfOd5negB7 MGaA== X-Gm-Message-State: AJIora8ZjW1hzgi6CK94Z8ZC+fpvQRvNAmEhJ9/ZzuKEnvWSjvundCap s6vU+YOtIqdhCnHNZudWw4dVJ1Ff2Qg= X-Received: by 2002:a05:6512:1310:b0:47d:ccfc:b07d with SMTP id x16-20020a056512131000b0047dccfcb07dmr16760761lfu.243.1655794005140; Mon, 20 Jun 2022 23:46:45 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id u18-20020a199212000000b0047255d211c7sm2046767lfd.246.2022.06.20.23.46.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jun 2022 23:46:44 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jun 2022 09:46:34 +0300 Message-Id: <20220621064634.16797-7-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220621064634.16797-1-jeebjp@gmail.com> References: <20220621064634.16797-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 6/6] avformat/movenc: handle OOM situations when parsing AC-3 headers 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: Km1PLKTXpzKH From: Jan Ekström Signed-off-by: Jan Ekström --- libavformat/movenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index a071f1cdd5..58ba0bc545 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -420,7 +420,10 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) if (!info->pkt && !(info->pkt = av_packet_alloc())) return AVERROR(ENOMEM); - if (avpriv_ac3_parse_header(&hdr, pkt->data, pkt->size) < 0) { + if ((ret = avpriv_ac3_parse_header(&hdr, pkt->data, pkt->size) < 0)) { + if (ret == AVERROR(ENOMEM)) + goto end; + /* drop the packets until we see a good one */ if (!track->entry) { av_log(mov->fc, AV_LOG_WARNING, "Dropping invalid packet from start of the stream\n");