From patchwork Thu Feb 10 11:34:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34216 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:14aa:0:0:0:0 with SMTP id bz10csp2244663nkb; Thu, 10 Feb 2022 03:41:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJxdcQHCwgp9Pa55vhY02ktflanlFi2g6gehK8bW/ezJdREPr3jiZXFKmOAo8iPPvDLEIUgV X-Received: by 2002:a17:907:94c7:: with SMTP id dn7mr1863568ejc.299.1644493309025; Thu, 10 Feb 2022 03:41:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644493309; cv=none; d=google.com; s=arc-20160816; b=GnW/yB9DKhR83T5HE1ADkELYg5aE1X+S0p1k/z+L+4U6o3I0qh11n9Cl8CHW2WTIme vyVQbcL4B6btAFPxsaP9RWhB6r2SqTFFwcypoUIqr9+7meCVe3YzhzyE6UGNdLDFO8Xq Gscw5pd+CL56/o+FzT2FUHsOjhtMjIU6x1L0wKZa5hXd9RLCnzu1k6KQ2HCCU/yF/5s+ PjLvFTOtXjk3FnUnjW4ygFq3D3Tf80g7173CPnZwbL/FYjeftrIXZfoCjj46Vln9mC6m W0uogliAlJ6rNV9nQXsoWmHLgeO21VSCVCib1lIyZ8mwpFnIr33d/3XlU5CHo77gjmr+ oO6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=6DRtule7bVtZiEXOHcHWZZ0P43tqcVSNjGm8z1qmIjE=; b=uxev9kixKg4S6Iw82BBomtxMlm9eDhSblEXSv3IKIXC8y4GtRbzVv4l6YQYbghXrGU hmyflAeu1qrWRQGSw5CS0L7BPxgh4HODtxHdFyZlYyGrkwoZcucuqok7sjd3D+Qu4WPQ hEucZP9W2QaDYTobFRt8pOg4wX4ehroNmiG8jEULmd0cXY4Uq0eRucQtVBSaEM5kG/mb wy9ko7EiXe93hv6m8NWr+pSV0wIyYT/0OrORuMKy2O7/B6VWew+OmU9COWkp+6vxt5mE Y4DXGYHGu5Lbggy67jH7WteWi7VqQVyk9TkbrpqCJmbL329I9ACa1UYsfaLm4OY2zF+j 9TKQ== 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 nd18si14658919ejc.961.2022.02.10.03.41.48; Thu, 10 Feb 2022 03:41:49 -0800 (PST) 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 C8D9968B1B1; Thu, 10 Feb 2022 13:41:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D2AB768B178 for ; Thu, 10 Feb 2022 13:41:39 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nI7ji-00Badp-0I for ffmpeg-devel@ffmpeg.org; Thu, 10 Feb 2022 12:35:42 +0100 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id I7ijnPRT2SgGFI7ijnT7Ht; Thu, 10 Feb 2022 12:34:41 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=f8Q2+96M c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=qX5wZS9MHFB6eZLz2DQA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 10 Feb 2022 12:34:40 +0100 Message-Id: <20220210113441.10740-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfBY4KeGGex9CH/yHfbPsr3xHDg7OzoTmdS6I+1IQ7OUGvDcU+19dG85vlxK5IWcOu1/RTagZ5oBCSrEYcusEPH6bjGHZg3DcPJ3Woy0giriGQ+KrY62J p3Ue+1XKFcYigq16nKEbAgdt87vYPdHqJzbG5d+r5MbpUb1Yca9FnLov Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: Corner case encryption error cleanup in mov_read_senc() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5Dr1mEhY3+xG Fixes: memleak Fixes: 42341/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-4566632823914496 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index a80fcc1606..5e26267810 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6105,6 +6105,8 @@ static int mov_read_senc(MOVContext *c, AVIOContext *pb, MOVAtom atom) } if (pb->eof_reached) { av_log(c->fc, AV_LOG_ERROR, "Hit EOF while reading senc\n"); + if (ret >= 0) + av_encryption_info_free(encryption_index->encrypted_samples[i]); ret = AVERROR_INVALIDDATA; }