From patchwork Fri Jun 3 12:46:20 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: 36066 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp4604751pzj; Fri, 3 Jun 2022 05:47:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQyMFdOA+06ZDA/TSKZKwrm3WM76bMxN6Ny1olJgqQgk/Tc8nMOZAaDl/juaBLETj7r/zO X-Received: by 2002:a05:6402:500a:b0:42d:d109:b7da with SMTP id p10-20020a056402500a00b0042dd109b7damr10683582eda.289.1654260455852; Fri, 03 Jun 2022 05:47:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654260455; cv=none; d=google.com; s=arc-20160816; b=DxeAsj3U+VyGofD5eNRtSUgmhXTVC2DVD86vRIiLZWrgvlqJA0yV2qGAHkzr+IbHyQ GqBBRA6JZSRFvNidWb4KJ15Y2T/2JabJ7iuxg5JNBTMWaHcxnzzD7rslLQJ0LgqKuS6h QCtJnYeYlDEgDb5iF+OIsprdXhUrhLX56xyAtZEuPGwypXyOuQbaiEmA+v4Fz4LF8GyX oEKtbTD6+8fBVPGalGR5y7uW4v0QPkyvVCSdpBmnsdOK3AeyXj61QVWftY3T/IknzqBD mA/k6NqUYQy9hni8g0ctWwYNmbxnWllESwx4sSZaStBRl7EaGrKtssI4/AT1upiAlNAa wiIw== 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=GAJ1GeRXYx4wdNREaCJEVF8ayQaHgVvdYbhyEMLjKEI=; b=pIfF28jLgLoIhxg/dACsbK5UurFrrrq90tTn104H27elUGr1tp2Nx/Qp/Ph5+aeeGA fG2dNZtlyukANd2G18vFuloI+8J+5atREJ4+eQaSbfr+XzCQtzWieb2Wgp8x1iT31+yi Axz2QWBtMx90W2FVVPFhnIoAnVpq0ALtjqaRkTXTXfR8joI7KFma30Z2tt5bxW2vpQkw f5k+BvAWkihQ+v7chqxsYZNkkQ6Tslvh07ShKAbA6gQAioBOF0asfQM3v2C/CfUHuq83 OH7ZwxU90A1MwZw38P/Onkr1HszC5bYKEI7IsyoQ5d4B3X2Pxskkt1n3fKPQK0oOnPZn 5Dew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VcBT7pHw; 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 cr15-20020a170906d54f00b006fec302305asi7180700ejc.281.2022.06.03.05.47.35; Fri, 03 Jun 2022 05:47:35 -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=VcBT7pHw; 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 D5B4A68B861; Fri, 3 Jun 2022 15:46:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6A1868B7E7 for ; Fri, 3 Jun 2022 15:46:30 +0300 (EEST) Received: by mail-lj1-f176.google.com with SMTP id s13so8311808ljd.4 for ; Fri, 03 Jun 2022 05:46:30 -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=0TIuYc6GxIvzB5mpdphBBItiAOd/E5ViA+RVudX1Hgs=; b=VcBT7pHwH/RaKSj5AXZrnDe6cEsMSHBLduYSxfiOiHxGzy6emmCrOzpqygkK6rlJpQ gig1MKzN2DwCqp2DQWJCGizsAvngdD/5xVMibOEl41WDBjlMnu+KyUooMZnr8PYnrFp+ 5xWYkYbrs2C2SR7GVGjAnBqkIwH7gmSx5v3OStWGGdMjnAvK3yNdl/bh364/t0JCv2pb lKkH5rcYs723y4WTGDy7M/PfXS3L5ohW8uVrMDUQyqqyvSCu38DWCJWbs0kzpm9EJ/t4 XfMTzUwd5AQ4zqzFvWVU8wXuI2sUHLv//tz+0+PQMGcguXfZSEOnalaw815ODYFUahdQ rTiA== 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=0TIuYc6GxIvzB5mpdphBBItiAOd/E5ViA+RVudX1Hgs=; b=TsA4hBvyXdZGiA1991WsXvee50A6dUMLEz3bAYEsKzAOASKzr1UmUa5BJtrDP+bebM CewE77glgRJzKnp/LaqUeFDUDWE+TC/2PaJELTyl1VbaPgxdtUBWjr5BLKYRjo5JqXj7 m/fjD6U3bmdVjDVc7Ki0j+n5ob8AeNCkYuYXh2FmUyPgrkHf95EuUmJ/SrnRQTE/CZhb dROqykOEA5b+UGTqxrF60YjIpRSd+t28rPxFyUpedBpqUOwt+ekpY/jFI072Jva0vsNl TJR09QxpGQyuGwTOCZu067XIcLmnQEEGhWGLuDHu3CRDFwyPt/9mitnVGdIbU1ImvPJE 9ORg== X-Gm-Message-State: AOAM531NX2/2y+KyxBWVQNcB52ZDypbKo1nGK35twwHOINb/KUZjOnf1 iny9En+e7MGFipra9ot14orjcRZVWUg= X-Received: by 2002:a2e:8881:0:b0:255:7790:25e6 with SMTP id k1-20020a2e8881000000b00255779025e6mr4059452lji.525.1654260390219; Fri, 03 Jun 2022 05:46:30 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id m4-20020a0565120a8400b00477b624c0a8sm1561081lfu.180.2022.06.03.05.46.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jun 2022 05:46:29 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Jun 2022 15:46:20 +0300 Message-Id: <20220603124620.15099-7-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220603124620.15099-1-jeebjp@gmail.com> References: <20220603124620.15099-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: FxzkDPnZc2K9 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 a1daf3598b..0f92f0e04e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -415,7 +415,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");