From patchwork Fri Jun 17 13:04:43 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: 36305 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp121216pzb; Fri, 17 Jun 2022 06:06:32 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tcMyetI16AuKaFHs0MJdBqNSWsVFv2P4xw+KTszHWAVYTNyTwzClaqk+80WLqhgPxxJgdT X-Received: by 2002:a05:6402:84a:b0:423:fe99:8c53 with SMTP id b10-20020a056402084a00b00423fe998c53mr12007835edz.195.1655471192389; Fri, 17 Jun 2022 06:06:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655471192; cv=none; d=google.com; s=arc-20160816; b=KqAov+d2uEZGpD6JIL1d87ryUrddYnHPXofLi8t4L1f22PSjiOf2M2fz9EkBs2P/sc 24J7oqSzuF8S/Q+erp+WHbNx04YnfW8F33xjMQDsEkk8jFFiv4PrD1667wb/MjbX/Otg +tWi0foZdwpEx4nnipMTBs95KKf2hMcjvmZAwXuRM8WHjegCtcGBY6bOrMoqMrn/IeQr aeytEYi+3C/aARhtyDe6mhxP3OtGBhew1HrndkiBjc1upJwsAXkcMOem3vZx0WUvUOrC rpG4mI6O6vY4W3kxUQHQbNRzsJeZAwBYaAGCh+WzoznAcLa6osOGxotWw+Tnkxtu9u/t jGCw== 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=Jz+xF9pvXIMAHxYuCmjE5zkib0JBevANqPc5BwrNUkoqe/9gsZMmRHtCN9IN2VWgd9 XZ41uA5YRY4GTzttti79DOgs6PVQ5CdGWyBCeGAklr9hKL+Ab0XXEGnFZHEZNsTD82xU mq0t6zGpfZ3yn35L4ZJi70xLEZLntZpLmHQ20ar0aLMlUrHWpoXtg8nEen69939QMPEv aIhl8NQUO/y/WysOIiO1ustP2hWJWCkgFpKB31z3cpC10nZgn+JyeikWqoFHbR/svDko wy6rMI+FwXNGWHzcozf2+5QTFLohajADkTAVJWlc7WectcE6swrCCnlAURQM9YZFS7fZ QzOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QBQxH7eg; 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-20020a17090760cb00b006df76385e6csi4837710ejc.780.2022.06.17.06.06.32; Fri, 17 Jun 2022 06:06: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=@gmail.com header.s=20210112 header.b=QBQxH7eg; 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 3CE0868B8E9; Fri, 17 Jun 2022 16:05:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBC3468B8CB for ; Fri, 17 Jun 2022 16:04:55 +0300 (EEST) Received: by mail-lj1-f182.google.com with SMTP id c30so4657575ljr.9 for ; Fri, 17 Jun 2022 06:04:55 -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=QBQxH7eg3wG1u841lcKVO4iH8LhISpOrCQxOez+IX7zAzn6RFFkKu+iQJqVdNIrFJG itKOTvwEoI+TLyH9NFLbZaDWMBpi/nIWGnz8453ZeMvD9NRHog328N5u+z78YBQxUeap pHx0S+hDmHHaEAi8VezYKc/A74WVbXl0WFHW1AUeJZ1T3EvkpRSqga5PENI4a6UwFpxa x+X0zBi6hEIMMRw91xaT/PZElEQ4cpRN1/8ZCk87jg7gYidwauil00sVDhPZz598xB7o 4eQEt16JaJvgCQ5xRknqYqRuoRlYInq67cVzHwHNv3q/9NJoF+UCF7sCKS/iXg7xYJAx fABg== 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=zaUDIlcLK+u3YjJVxq9RzLh7dOPo5gv+pEp6LwqdPdlAz+ppHARsTMjPxitQninvmD bamfym9SAwOz4EjqtBwI/ge9JBY1XloIT+Q7HfdfRWLCq7ruAHk8yFEM7jwNp1GEm33t n28b3bfzL4LkMi1SPK/9hIo3q+6luCXZUmHow0O0G54D+gdBdZQ65jDoWdzkcQb3Mtes 2xN8zVCBaM6Yd2rJdrA6n0Ufex9m5ZQtTTCAzQFbnmTlWguEmBXVYzxoiSH5L3q0jiXM mtI49BVMNpXMmPVKdPgEIoeaZoNNZZukRFIgxR3Qh0OV7MqeaDuDaWb1TKZY7wDy8Utc WkUQ== X-Gm-Message-State: AJIora/7upg3v22LDr49jJ4bXLymvEQsoMj6ZUeMlhLlZoDE25A6x0qh yAuho85fZRL5ClkXsCrC071FBwkCrxI= X-Received: by 2002:a2e:a793:0:b0:255:a3e6:986f with SMTP id c19-20020a2ea793000000b00255a3e6986fmr5152544ljf.104.1655471094889; Fri, 17 Jun 2022 06:04:54 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id k20-20020a192d14000000b00477a287438csm638487lfj.2.2022.06.17.06.04.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jun 2022 06:04:54 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Jun 2022 16:04:43 +0300 Message-Id: <20220617130443.188377-7-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220617130443.188377-1-jeebjp@gmail.com> References: <20220617130443.188377-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: 2apLFtxCkCEK 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");