From patchwork Fri May 17 19:51:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48965 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp3088594pzb; Fri, 17 May 2024 12:51:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX5oPM+ycpjQFFnZMjJoG6kS4IkaiLgHTkvV+W6dZtOVOENqgaIJQ0S0kSaY17KsQ0tPqHI14YoiS7i31WTeH/msKyotq1sFwGuVg== X-Google-Smtp-Source: AGHT+IEyAFxwFCgbVGL3j4UmBf9RLs0JEEBaFpVeGr5357/sWrvLid8mGdMkE9u2LSfSkTWbA7Z8 X-Received: by 2002:a50:bac4:0:b0:572:9f40:514d with SMTP id 4fb4d7f45d1cf-5734d67aadbmr14608421a12.29.1715975482722; Fri, 17 May 2024 12:51:22 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-5733c2d53d9si10319573a12.329.2024.05.17.12.51.22; Fri, 17 May 2024 12:51:22 -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=@outlook.com header.s=selector1 header.b=GEWj9PoM; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE8E368D16F; Fri, 17 May 2024 22:51:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2104.outbound.protection.outlook.com [40.92.49.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A198E68CF1B for ; Fri, 17 May 2024 22:51:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dZ8z0GhMk5N12rN9vVAE3SZXcH4jPQ12id/xfFe5iqBN6+SEB2ztssn/s2y7aVxod19RbvfKNm+B3QQT/vSben2OkRF4Y8nkFZ7xRvWHDXwu90wkaUP50XJldYV5CLjHEQk4w+bgsiUnEVC44F75qqlBDmRiUmxmIuWE2PUF6FRaKMLyneuRpOOSrf33YCVfuxybNIHDmzNoEGJQ4fZCbXN+VZVyN5VrrCQ5qQUbqZlYaaTtgtvttmedHgCL1gFNR1176kqmkoX8kjD8t5YhcN/+cEuA6oHcL2k/BtXOj5xT3RcYqm8CEVSCa7N3OlEta0whHZlqzhkBHe3WKIyXiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DsMR7LwLkkiFt4WlDDOz876qEI3+sCOyoRENIFgeatQ=; b=MQI2sja1TaEWsOqSDEGHmpeKrLqZ9nbhWm2n3RyPOhd1CYJbO90rNf8Asn7WFOu9M4Gx91hk4Ab6zxokX+zdMupr+W65qE0v7PALUwgEb606M3DEK54OkqdGoGKx4GPgeqn3V6b+Oy1DrFygdtmzp5KuplyLHA2QdIbc/MDhCiGgjP4JgRhF2/ZYKfidznr1LINdtl2aWHsVjOXMl5cdgE5hJKRALb36THWL9vlh3civL5BhmzA8KjSOSf4YpZR8kxJPfYM4Qxbg8NPjQIMq+0jJeevGlY0zBUFUmhloESQ5rLcgu4XopIE/+N+rrGrYhE5UFmMhuGZ6E31bilzSQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DsMR7LwLkkiFt4WlDDOz876qEI3+sCOyoRENIFgeatQ=; b=GEWj9PoMz2ZH4INX2MCtp93s9g9G7dsMJ19Jy/66kN75lMNfQ+uQVI5UH3fvF6vrd4CzK/5fuNJwzjg9yYXaP2gM9nlMeXsq46r5qdQ/xrDcJAuCPD0uFutvfbMPtzKsWkvmZ6tJ4YCDquRFRhHhZ+woVucUnF5w9YRHIrRkegaEjJagrZ9yZRGcVTDwTV7NhUwm9Z6WU5qm9HMTw1rcrUgio0kQbdLg8nkO0QJ9YLWHA2/eVsnlFLLkC5/srCNmZCogWcESS50Mdv/vpfP0wyYBKha8jAkjbzhuZdwRI8XIkUQU2g5f1mFmJz/QXixXdPp6b+kTEO2vjyvUWFMp6A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0123.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.28; Fri, 17 May 2024 19:51:12 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7544.052; Fri, 17 May 2024 19:51:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 May 2024 21:51:05 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [T3DrMuzEyVdLT1V9c1FSehpfvL0yVOmXw8hgRV7dtw8=] X-ClientProxiedBy: ZR0P278CA0055.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240517195105.290397-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0123:EE_ X-MS-Office365-Filtering-Correlation-Id: 24d6a1e2-44f5-4154-6ad2-08dc76aab452 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: sPi8FKVCZ+N5QRUzwHMCamVlhWw87/26hn9vmy+NPSPLtLawDkq0DGqXobPktIVlgxfMiOV/EJjVr/xZij7UXVP8VNNst8V+2QStDVf59y8LY6+Gx0XMFO4Yla4SMP9qw0ip7wJKjrgJgck+LmihS0Bp0Et62mcAV++eQ60yDJYgu16+uBzof8zAlU0ok6LiP7jlxKrtCZBXq/XZn1hemscYqsDnWh0RCwRnkSKVBj7E7SahiDBKOMOOdLBpTYnL52jnTmW5ovCRKWDt6tVgmRkt8epSmpdIRT+fynK4QVR6ehlwxFhIwIEJvTysNOpewDHgfpPhg79Lnfq25HBydS3TakbmqfqNhR0gF+1EZ7EWjE9KH9x6M51HqF35YPjwE1ZuBqVo6FgUOMs3/lNh9HwW1ve7vKptLZzpqIqDdKo4CiWxdxPLVYcbhpax44eIFw44GNTlKL5sgMLxY2exxSfmCaZ38Ub652ANCj/GSx1xRSmaBwfMnZe8DUzP4D8a8vWCDnzaPQyXGQSCHhjK22deDPpDXzRtx+69shUUzfLDjaR7AjimJI+E+J3OoE0P1ixpX7rZh/LokccfR0CSPkrRyjkme8m4GttjfuDQ2CbhcBBdviD9KrI0cZDL3nis X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RXmPjigv9f24ffob9gG2OOA2RjAv31XxcZDCTMXjalxuz0VG1zAqjkfyLU36ML6pb7MzSWsvCiIsXK8dOUwSh8QXn5oSsczJla6V4GLcPeEtG1Lp8OvrYb3gTuB2XnLyWJl6OEyD0jKJW98bL+juWk9Ds82gBQ0CsAe9I6UizvRnyPYUVgKxfqEmGHhvF7npE3VgvD80U/Zir9gNTIB5l+imCeiDN0kuVBJtu6TZ8cnjvk2BecXVeNvUK2/4Oh7B/DeNpcqMAYwdPHWSY7JBufJutBARHWrD7Nrik0LA4W71I8qpkBzKD2AgqRiEK8KXcY4oHUa0kSeeXmCgtrtl4t04GvZEzeh60L1f9ha0JD0f54PGAB+07hquK0ACMiORCo33jjyU5JrWRDd1WE3VN+0mqnl2Jr2Zpb8q7XWvHea+DVbEMnvlwM/NHzP4OnEpItNYS1OhL5HPMn1ngAQKKCvoegrZc/61LYmFGrJYvrlkBOlVBBUORYDClR7zlnDZH3SjQA98QDtXWe1Dp7ArT4MkAN3aXI1XF03+rhpCLlyGP+O3j8ISv1kjUpjLVx8Xb9XjBGspnUCWRRHzb9xtFs3NjO6SEVtD6+++4D9bLyShiPA20Q1Z1rZUiXzEREMFPalzU/3ZApkWxv/X8kz6FAP+5RAPJXogNgnPDr76iWeNlKZeG5LvDQS6brg9XcG6tZlZQyBVh9iD8FtdVgvrLMKLdxPSvEDYi5Cj/BI5NM3+v72KX+huH1dKr93SZz6okJAG0/OfBEZBSJkrMM+x5I255BXexalS5YOFirra8wZGs17yFivO9MLIIUzI6sZfcFd09yIBP5bG8pnfuC0X2/jSm7hpmzjNVlZy7dqxrjnbOjD0IYk+f385BVr2qQtcCoGGO+8Np3WwOOCd17B/R9a83LSSf7nEKXTXiDfklrI8EmlviRM1JFdKmFjhIAYo92g95rCqmTI9fFfIAO6H2MhZiY22t4xPDKp5Kmr/rmaPiIR9AVBSXKSCdNmab2qhsgsj2gBndHD3/rFTJGSNcf1Y2mEOh1/e9xvp6cyt48IzMgmzJpW5q7d0Y9GxILBFz5ipYMvJCMKgEStwrog6H2dJJoGJuxceBoFhZZt19AOhlO9ZNwbrs5DFxk4xvyG5r2SaU4iHVGFK0mW214To9guye52JU48CsyuF1eDHnmub6gpBz2mXDZGfg6G7mB+3IZgo/dEiaORT7WY1mR3H8Ae19vaFeUiw+WqOpL1fRKtSZRh9QRzSdaNfcYpSEGg3gzLZrHAQuEVB+0BcC2AmOA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24d6a1e2-44f5-4154-6ad2-08dc76aab452 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2024 19:51:12.3651 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0123 Subject: [FFmpeg-devel] [PATCH] avcodec/tiff: Fix leak on error 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gg0ld96/luAV Fixes Coverity issue #1516957. Signed-off-by: Andreas Rheinhardt --- libavcodec/tiff.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 19301d9e49..111ce3ea3a 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -2267,8 +2267,10 @@ again: group_size = s->width * channels; tmpbuf = av_malloc(ssize); - if (!tmpbuf) + if (!tmpbuf) { + av_free(five_planes); return AVERROR(ENOMEM); + } if (s->avctx->pix_fmt == AV_PIX_FMT_RGBF32LE || s->avctx->pix_fmt == AV_PIX_FMT_RGBAF32LE) {