From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3306142AC7 for ; Tue, 12 Jul 2022 10:28:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5FB4768B84A; Tue, 12 Jul 2022 13:28:08 +0300 (EEST) Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068075.outbound.protection.outlook.com [40.92.68.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 19F5468B61D for ; Tue, 12 Jul 2022 13:28:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aXYOy00bj9lcese5rr+ZaJQsy45rkNw3N7pOfX3QgnXpMbkEQRis0C3nfwfk3xjUNRui7oEi5VO4vZceTjP/iJhTA8RHIkyc0cPD7EK7pJVvV5lWP1hZIIAezlmPJ4PQZk/+Wdv21juX7XyhEFhnN2kMW2cSQkanryqb3brCEi+wU36lFuZiQcjrivWFXvRJdVFclrAfSypNHg6ErZXdZXHt8oEXZQm65yLS3pbCryHVs8qNV73Zwkm1Ta51dZP+fP36nT53PS6Aj8wMpveKhNBEkssPZgQW4xYpvTGJrqCKYxCBOXbtqUa/STNWigIXsm6PkYS73G7pc55FetzrHQ== 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=NO6boxeqKYV1bUTgWFiT9ChmSqEFho/6PT9E3j2txiY=; b=clOEyQ0Is6cMfEWvitwv0O8fKjjMoJ5OegHO2ESx4dVrVavLWZhcAZVbJQOB/IGR802yRmnB2xMWOuUWzhPPFQyORiDnYMmOq9ToQcbORSxOWFjdWS4ma1Yqd9IvoTZWgQX9grnb/n0B4qz5vgJrg8+D0tpxxDVm8cVlczXaZzrs0VIQBX3gLJXkT/bMIRvHtbyJr7LCdpQdHUrnNslzXcqiga1qVh7bfHxu/nOVhlwscLg0jBHmxUCRtOmZRxED9rpKjKGH3bkFskDsctw8cSZJilYWkKfjC7u0pyaj43TFFix2Poe972RvObQ60lgKHotEgCurWxftCbFMzsyXtw== 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=NO6boxeqKYV1bUTgWFiT9ChmSqEFho/6PT9E3j2txiY=; b=a9iB1MkQJn7JSCeLpwvXJv/dEaP2amN6OgRj0UF1I5/EKdZ46i2ElagFet4yzZQWc1xBhE/jv5WarN4a4fWgpZwFbbij10vD/nkycbDCjLIbFYIFkIDiiXvH3zRZVBFy+S0OxykU3bqVEPTI9FOLEbRGQhY4GbXrbYqSoueNOSTMI9ejs+nseLJ3gyQ6nYHS9hEwMcOifeu9ySdT81+ThG6BpLcUkV4QQ57OTfy/sQ4jeSZQ5+jS9LkqmTp/PEoYEVsW0NyDGlaEHu/LM7JqzjHjz2/i9udbK8GCotzfrQI71Qr+NeiRpr6c7i/9vTS8dO76uwZQxa8a5tj+FZhUAA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS4PR01MB9934.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4f4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26; Tue, 12 Jul 2022 10:28:00 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5417.026; Tue, 12 Jul 2022 10:28:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Jul 2022 12:27:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [UFL62tl8h5vwFAcXCkqYm8CkbfiOipC6] X-ClientProxiedBy: AS9PR07CA0048.eurprd07.prod.outlook.com (2603:10a6:20b:46b::15) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220712102751.3784996-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bebb3b30-4656-4874-19ca-08da63f131f7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXMm18b5TlTbUk9d1Jz4Ba727Pzc9OAl51+CjeWvsTJjiU41NG5ZWL2umcv9eBH0p6pt70Zasrfh9uywjRwqK6h6jDdSugqp4r4cGpDF2HJKk1CfUEtnhxJlI0reIOo9DKhI5fAJsh0wIWyDuVihwPgwjvhXVyijDCZVrjY/N+KnY/iaeoWffQ0KZ+ECRxIBM3VX5MJ9XhOYPzCMjGgusjE5wB/mYLCM0EJlDVK5YmlGCKQMk/j2gfam8zxyBS21uI8fmPwjoiAFKV/zwI/1NhVdZb0Yrqf53pV4SRpDdHnNIU+erfrHQhTZhyyZqGlSZfv915Tk0S82xUunqVXsXeybAnkKjjSpPy+KluEqmTvMAsU44SydeRSI9swehu/SzbOEkUBCkJvSx/YgH+fO7HA+rWMmpfGLRbdA7HsvXgQazS+T67ll7NxupnoG+j63lXABKszZCBxU26QzWRI/Tg33E3h9l6y23Usl9GoMbUtnc+4m4nBpJaLN449BDqSy7TDbkxkfOqpvLPWOQvvTM5qftj821ZcUsm6vAr5iJJQe6kTwz0xuF69ckQCp33n9oS8dpH5PogoTMYcU3SB7yKhWFd1cgDW+yQz9fC14JEJ6AUz6t57+I/ngblwmix53XCqDeOH5VIBl1V3USpdpbmWxI5NQxIs11Den0jH4OgiPdLcMejjef81QEDpK0sxLKiWJO0Ad+TP8rmKiez7QTmSvNWf6vA7gNI= X-MS-TrafficTypeDiagnostic: AS4PR01MB9934:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GWv9md3E35T+eTAgtF0XP0cju5wserKd98qP68WUshTl1MGYrmx539sJBVQOcbOVw0nM9TsDDZI/O9ksjMhrqj2XOigfR+iPLLDSpGnQEGJ1kh+2k5EGntVQFZsndwOvlKadrPUwiu/lz1OITK7jqF438mXRlTZePc4CvJHmk7ZPaFDZG8D4hwQG3QcjQKT6yod85oGM+AXZmLVgcJxTAk3fRrDx0Pas8U9I5iNPCP+Zlx0g2u2mH1bHvwM0vKt6I7roC09YnPh1w4rppZdMw2kkUMrVwu3f5uHOM+T8Jzhfn23nw+B/UB8GeRBHtpoWRv/ZLHdC1Y2Ze9bg205AUHHrqiqk82JJ50mKFJwjVyeZo03FhYH/MxiMbH8qMm018BPCLTHBjw6klPKuolOr7c9nHnEZQCOCFKXXCjqcKAX76yBg+90b48cX6G5EENXZkf52aQrxcqJW9kepmpz7oPZInpOciqAZUGLWwTkGgpwF6QwZePdE/myMATYwm1/rGh6viw1ouFO6700ed66LrNIviobiq0VIAxdnED+i8QXEZaQjwNovnUmSgyzJUGFA5cXjJftKTzuemfjkC0ys7CHiTTY4lf5zPYbjOaCQQr8DDnzYTbJZ5nGJ3ms7vPuyCptmlldjNEJ4aDlj2LnhzF6Qu7n0O+dSKyOjsiM9TEvOrEP84YcbYmRiQphrECF6Rcsev3Bgdr4GFIkKnOQ6YA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qfI/xRHnvJ+E4s1pz/Qy3SgN/sZ1mfAoI8R+Pw499o8nWB+M2KuY9Deo6e1g?= =?us-ascii?Q?oQzx7Abaz/C7hWGT9+guzNBKEKafTB9PKhzsHmKzqewycHehJp5LClG8l/XI?= =?us-ascii?Q?6W9wESPtYOMBnA6qN54DoVqP3FUFllUxnsBSbOiETYfckNjD0E5xO5LTnPCF?= =?us-ascii?Q?+KjGaSYB8jUBQBtiO5thpKB5NFCQ4i/vqqB6GG+U+p2QmfCC4Hh4EtLjldOE?= =?us-ascii?Q?mMxcHi7st+10iL7g/aSkPBJ8RqEwB/2ZtAmKY89QoECUx/nUpkJ+zv34LK2k?= =?us-ascii?Q?j0VDw8ZYEEIGC9Zha0grEMaFl/azZv4qSn2zxxIMwfzOx+8dye8EpUi53ut+?= =?us-ascii?Q?ZrkI9JTQNlakuFqJptwHABS4u0QNmC+CAzNAqq1iyu2EmB6AzaWySqqUcf+O?= =?us-ascii?Q?BbvY3Zni6SghsucRMQvXouBErIx4ABwUHzJ9BCPDs7Po+4aRFUiemHOqAHtm?= =?us-ascii?Q?eay7AFx48QLMdMlv6m4bfn/P+MGPTIRyDXEi/GMadT/Vhe2GMIEJ+agevbtm?= =?us-ascii?Q?5VrezZXJoY7VrP96Zpf7SS5yzUhjV0D1NLDZUpwsgKtYxN5ry6ooeUHV0j5b?= =?us-ascii?Q?F4pQh2rM0TYNb/tD6J9vFtl9uVJfiPNBxR7dvz+aIvlOg9feCqLfBsREzqGt?= =?us-ascii?Q?IKgj0n9qWQGotNHLwBd0H8cA5yG6iJ+h5shtyl9kNjewi6z3WuZFS6fNyaGA?= =?us-ascii?Q?lvNkvpi4/O8VbpEMFhHLqYJ5P9ghtfbALGEY2LtmMkpFQfQjM+VN+oDaajPI?= =?us-ascii?Q?q5OneLahrJrdMYGkY8NV0IVQjndvDbl0Fmn/t14p/c4ImZUTudqtH4w1Q9JB?= =?us-ascii?Q?yc5sykrnm3aZnvFLsyh06FvB+JkiNMxkxsE3TLsqEm66++Jx1fmaLMS/Msue?= =?us-ascii?Q?YwdtTSWhOWtKKQzYcsICln3kYRIHTdLCMLd0tpQbkINYjRWvNvn0UpeGwBFG?= =?us-ascii?Q?+6K7d8MFmwx8oIsYve9o9fLAA66w4ZqJFDQ6tdAWBrRHEzstvpQaCUiKIpqJ?= =?us-ascii?Q?9Cp4wF/PqaLH5MsT+GfNmtMxHfHq3nd2BJvBr+zOEg7HjJn/TFlUAI+/qmZ+?= =?us-ascii?Q?eUME6JPYSSJUHfR+L+MN29aHRQg9MDbev64qxuTak+zHaY5jKUxiRpMBKD3N?= =?us-ascii?Q?8UwwXIkAUrHynvChBiqRvovPIXsytz8hgW1SraEjA2VxZ/V9j+E/pgiyqS32?= =?us-ascii?Q?Sw2oGmCetCPPhlB1wEIcZ3qzhy3H7T1ZdS2XcLp1LL1wKOb14JNR3jHnldxD?= =?us-ascii?Q?mJHwXxwX3UD6dRHlqmAB2bK0hUmJ7B5TrwrxVWqEoUZGO3MT2QMq3I672nvo?= =?us-ascii?Q?XbQ=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bebb3b30-4656-4874-19ca-08da63f131f7 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2022 10:28:00.6173 (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: AS4PR01MB9934 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/iff: Avoid redundant frees 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This code is only called once during init, so none of the buffers here have been allocated already. Signed-off-by: Andreas Rheinhardt --- libavcodec/iff.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 4abbed8dfb..f14644471b 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -246,8 +246,6 @@ static int extract_header(AVCodecContext *const avctx) if (s->masking == MASK_HAS_MASK) { if (s->bpp >= 8 && !s->ham) { avctx->pix_fmt = AV_PIX_FMT_RGB32; - av_freep(&s->mask_buf); - av_freep(&s->mask_palbuf); if (s->bpp > 16) { av_log(avctx, AV_LOG_ERROR, "bpp %d too large for palette\n", s->bpp); return AVERROR(ENOMEM); @@ -256,10 +254,8 @@ static int extract_header(AVCodecContext *const avctx) if (!s->mask_buf) return AVERROR(ENOMEM); s->mask_palbuf = av_malloc((2 << s->bpp) * sizeof(uint32_t) + AV_INPUT_BUFFER_PADDING_SIZE); - if (!s->mask_palbuf) { - av_freep(&s->mask_buf); + if (!s->mask_palbuf) return AVERROR(ENOMEM); - } } s->bpp++; } else if (s->masking != MASK_NONE && s->masking != MASK_HAS_TRANSPARENT_COLOR) { @@ -273,9 +269,6 @@ static int extract_header(AVCodecContext *const avctx) if (s->video_size && s->planesize * s->bpp * avctx->height > s->video_size) return AVERROR_INVALIDDATA; - av_freep(&s->ham_buf); - av_freep(&s->ham_palbuf); - if (s->ham) { int i, count = FFMIN(palette_size / 3, 1 << s->ham); int ham_count; @@ -291,10 +284,8 @@ static int extract_header(AVCodecContext *const avctx) ham_count = 8 * (1 << s->ham); s->ham_palbuf = av_malloc(extra_space * (ham_count << !!(s->masking == MASK_HAS_MASK)) * sizeof (uint32_t) + AV_INPUT_BUFFER_PADDING_SIZE); - if (!s->ham_palbuf) { - av_freep(&s->ham_buf); + if (!s->ham_palbuf) return AVERROR(ENOMEM); - } if (count) { // HAM with color palette attached // prefill with black and palette and set HAM take direct value mask to zero -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".