From patchwork Mon Jan 27 08:28:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17581 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4C81344B206 for ; Mon, 27 Jan 2020 10:28:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D43468AF81; Mon, 27 Jan 2020 10:28:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3B1468AF42 for ; Mon, 27 Jan 2020 10:28:29 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id p17so6021372wma.1 for ; Mon, 27 Jan 2020 00:28:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NeVgT0OrdDYiVuVSQC36BMjiyXFAcn8LXdg91fujYBg=; b=szl6IuHwdwMtEqrOkEdqle2fWxjo2640L/i/5zK7kKiDatWMoHYTaxegB4ZEez02N7 V5F0PMITj1adwbmM6HtW+H24eCrnL7WtjpnyFxFgTmQHnVDIoxvv8+RDDkBKR76aX0DS cqQiZgQ7zBdlJH56SqOLIRi0Wdw0SUec5S8po/HSqWO90kmkMZJhxsmwye53VCPz0Sa9 Gm27+IQM7haGOASN1K53bKHSzIYibZSLW088+sxQEC6G0U/UZT/zkK5d8cS/gtmJSN2O wwGf+In1MdrFd6YsfltJcofJWyT3KPSEeFTZbWqM2W1CHCf009YfNyekPifP4e08tiDl gb+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NeVgT0OrdDYiVuVSQC36BMjiyXFAcn8LXdg91fujYBg=; b=Rh0M9eguHtQhdNk8xTTzXk0SDo8LxNO1j1VIzjYCEDVNOXAVVXC3tmMCEU7HxFum+y pWs8BvL6mK8Jlp9ec3dAkjIJ/3r309p3s8zAqgOPbC7mTi6sminQYicmJ3zuEhVvTBDv cJalONkVaSA9zyv3AFgdYDzCHpS/b2i5zpeD2qKuuXZucR3j3RRdG8texdREJTG1eDfu iIePPpEACCMFQ83YhjyOPI/CSrESdXXYZopxifPLF4f4PqI/30WJI/DbxVSLpthBLdFs Rq7f9rg01hI2MrR1XdLaGwCsjBhwMlETVxStHDfvaGmj0TwTyvcvZRDo510rah4UBy+R xCdw== X-Gm-Message-State: APjAAAWVi8ZLGahc1uL1NRZsFM+m1XZlkX4+ejZZXxvgQHBsgDGjM1xm jAgS9hAH6YOvlp1uu5aMdxsqHACJ X-Google-Smtp-Source: APXvYqyX0vkJH+xF+1iigjN1UbZFa2yIRt3z9zw/Q+lai5cXSD0fcz/C17Th5uk94F4zu5RmIwI3IA== X-Received: by 2002:a1c:bc08:: with SMTP id m8mr13048040wmf.189.1580113708823; Mon, 27 Jan 2020 00:28:28 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id o2sm16974156wmh.46.2020.01.27.00.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 00:28:28 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Jan 2020 09:28:18 +0100 Message-Id: <20200127082821.22770-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avformat/mov: Free encryption data on error X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes memleak and Coverity issue #1439587. Signed-off-by: Andreas Rheinhardt --- libavformat/mov.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 589576b529..7b7d4f43fa 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6329,8 +6329,10 @@ static int mov_read_pssh(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (version > 0) { kid_count = avio_rb32(pb); - if (kid_count >= INT_MAX / sizeof(*key_ids)) - return AVERROR(ENOMEM); + if (kid_count >= INT_MAX / sizeof(*key_ids)) { + ret = AVERROR(ENOMEM); + goto finish; + } for (unsigned int i = 0; i < kid_count && !pb->eof_reached; i++) { unsigned int min_kid_count = FFMIN(FFMAX(i + 1, 1024), kid_count);