From patchwork Thu Jun 30 06:42:37 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: 36544 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp106895pzh; Wed, 29 Jun 2022 23:43:55 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ufp2IvoMiKwJkVg4YpeImDd3s4icKBgC2b3ySG1QB3pksWI6/cq1BEmOuR1EWKoYe1iiXC X-Received: by 2002:a17:907:9488:b0:722:e5c8:c647 with SMTP id dm8-20020a170907948800b00722e5c8c647mr7113053ejc.291.1656571435326; Wed, 29 Jun 2022 23:43:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656571435; cv=none; d=google.com; s=arc-20160816; b=T83ck1ZCG+eXfyrMxWyKcJsVsiz0CsExqZ8y/VXcgRwXVVfPAC53Rv+qSmP+LMtZmC uXL/xPLMOhu0lOF6SUXXgnLLJ/Rugl+Lt6VdPgAo0Bp7eHXrCMLKqDt7VoH8F6Q9IANC wSKBby4GCuxlMpdQH1kpJ5zL7hEjB/LdH6TTg5nREzHHrFwynQPNJaN2NU9l4A8/6sL2 uhfqoTTC8dYFXXJPP1QhxHOInY3MmTCD5gq1iI2uGYqKrdH9bwpfo3+G0/3EEc7gCJsF Fj1DhQz7lrGpL6iy8vz+jfkjYe+vVTFnFuJSEwKga9MWbzfCoNeGH0E2Na0q+0/l8h71 CgyQ== 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=9wYMeoD/qYxtihPizQjWTPGMmSB7ad+Ls9pv2lVV4vg=; b=aEyXtgBZJVv29y4kPiNP3ctsATm7zzdyHsCy5kY8ZyE9OZ+FYC5s5OW7tRQjkBW7kc ovt8WqzfVr7f5YWNl5cBAKMInwxO7+UESoc+332kG0k4muCa986pwj7cTztg4zYvcAsH YI7JeiD9J5OpGrUHZG1jznhveObvLVwSlSiPV5otL8kq7l23nTFSmbS1JO3c30FocsI0 d77XrhdKefv1YMloYCJ3koMH+9z84dyizUqwd8WtzfS2JPFGzyd+J2yh2Twxg5j9uEDX waXPFU5OvCoeKrKTRtgycic1b44PXuS1O6ATJ1l+EsQ7BMVrQN5/0UlgRpgr4JiRl8nU mcPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=W3vOf8E7; 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 sb36-20020a1709076da400b0072625d8a873si941858ejc.927.2022.06.29.23.43.54; Wed, 29 Jun 2022 23:43:55 -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=W3vOf8E7; 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 AFA3F68B7DF; Thu, 30 Jun 2022 09:43:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8618168B748 for ; Thu, 30 Jun 2022 09:42:51 +0300 (EEST) Received: by mail-lf1-f54.google.com with SMTP id y16so8125520lfb.9 for ; Wed, 29 Jun 2022 23:42:51 -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=d15wzqY4w4aqmd12ER9pFuSaUjsuEW0kZn7pujcLHNk=; b=W3vOf8E7s2L4RQShNEVCAV++5YoLIfPb91O7MJt2ouSjyAkrEn/4nWOnpWpozJg/mn XWyznTgCj4odF2XWnlA2oOPx1MJJOTW2o0UAzVm35PlaPXvyNfJGdEaTMRtaGXE7v7iC 0042XhoyfdiGbvvqaRCDEvtujDy4kdg0LulQo0OK0P8c7R72W2ubkG9Kk1MV8fYKKAbN itApMDQpF2rvK2Y9OX4dyqDk9XR/MdgzxqhBT2hAlP3TaW74WoMJWM9tS5zOi0I4f9R5 uqLVxTsxDqN+XobEN16zRvidWNKb0RLh2Oi8qcKsV/RrNn+MspbVFpUfnCvKS+ZImlKq ZibQ== 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=d15wzqY4w4aqmd12ER9pFuSaUjsuEW0kZn7pujcLHNk=; b=oN6qBuJXQo6x0S604j6IPUjr8JKMUzx6AJf4872WW59oaY915yEpMETqKF61b4oLhG FRXajru2PIIdeh0MRtE5EIIcmvPkp51OQgp/bQPADMgMgbZiUYnuJBTXVial82KjziRC 4LGP99Y+PuDk6DALVl34ye3J0LZYriJn2S/aev5j7GDpYltQF62mGTWkhEygw5m8kIag 0lPCa+1ksPTghxQtFLSVpeCrw177x1yABUuSA2mMLOGnfmktbujMJwL8q5PUmWBQ8GIw 5sUk0cfA94xRaayOvoA3gYQG+DLv1JXvNCtnyN82FhRlO8twLf5Sd1JD6k+eDbt4p+wJ bgZQ== X-Gm-Message-State: AJIora/7GdhGJhoKo8YpW56R3u0aEXBofs4900kEhSvQla/G+chDtYTv qYoB6PrqYx4ok/JgLVAfzpgv70RVwCg= X-Received: by 2002:a05:6512:1321:b0:481:31e2:1b3d with SMTP id x33-20020a056512132100b0048131e21b3dmr4258198lfu.263.1656571370987; Wed, 29 Jun 2022 23:42:50 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id c17-20020a056512075100b00479112bb555sm2948091lfs.60.2022.06.29.23.42.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jun 2022 23:42:50 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Jun 2022 09:42:37 +0300 Message-Id: <20220630064238.45315-7-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220630064238.45315-1-jeebjp@gmail.com> References: <20220630064238.45315-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 6/7] 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: 8srEcskB/CwQ 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 382c2f2e75..022fab675e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -416,7 +416,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");