From patchwork Sun Mar 10 14:15:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46935 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp742170pzb; Sun, 10 Mar 2024 07:15:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXhVKw2mBWrn+8BEGgEyyWcJCXPfdMQBVheUaV2l2RggTkH9Ey1qZ57W0yA8ORxbQaewqrN/Ub0exKIIyGBE/UXqodP580zDhNUYg== X-Google-Smtp-Source: AGHT+IE65luYHYwZ/YgMeNryXk16c9eg8HgT5KjHihL8M591/ktnLhsQ0wmczU28kJ0AxjUoijej X-Received: by 2002:a17:906:b886:b0:a45:bae2:7766 with SMTP id hb6-20020a170906b88600b00a45bae27766mr2645270ejb.27.1710080129758; Sun, 10 Mar 2024 07:15:29 -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 lr13-20020a170906fb8d00b00a45aba160aasi1611303ejb.549.2024.03.10.07.15.29; Sun, 10 Mar 2024 07:15:29 -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=lWMDIIyn; 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 DFC0C68CE03; Sun, 10 Mar 2024 16:15:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2047.outbound.protection.outlook.com [40.92.66.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1C1CB68CD59 for ; Sun, 10 Mar 2024 16:15:19 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Knmvd8XxcnWgkFmULOWA2pYeY+Th8pIA3ze8krc6ZRXbgVAcUTdmLTvJod+ZMSJ0Gtz67gtrtkHqjQmuIbUVpWMwtlUSDME6uIKW1aocvdIsaEr16Wc1bcvHC+M1ySQy/ckj1vJwaOcEOcdbv9koWUuNmKTYJAKc3AxSwOKp0q7bORaNwJu7zNlC+AKN/FHwDQpRbt4JKlluwKC8qKnhE0KJNhUoWq7+KDYDTjIDJwm01Iz+nP7EHpY6oC4c70uj5McLj3ekg56LoTaekW3bbudxkecnWkXonPxNcVeM1A/GtW9J6nUhoVbxKcL+5sCqtENxlbIgv3MZqMZR5vxGkg== 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=T3vEDjY4uv4NOSNUJ2kIC8neyJa24+kVJOPqliJ/pqs=; b=A5cgOSEflPO4TNgj49JNwsWgBRVO2VeG88C2sLc+p4Z3wvaCK5bOBWuiBIZer2O+cm4la69wOrfUabtDRRO07iTvkk9vSncV0UWB09WilG1UbZ8FSZiUbYj0N7nbWeD5vWbr2ABAPMDaszf5sewbK6fkjYT7PVdXkWxf9nXjUfOLchsboxGXMHJI2WOR2bt71vGhnG25lZcwWPpf/PEY40BMX2FEkK9K7OXXJdOiuGhGT9zq4uqs8PF9QtQ7wlGI9ljG/da8RE6dWzx2cEkYS4Ri+E1R4imf+DWvim/bZ/Pf8X+HLDx/YD82TGlzJuBXYTSsW4+Lcz2NltZrt6o8Vw== 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=T3vEDjY4uv4NOSNUJ2kIC8neyJa24+kVJOPqliJ/pqs=; b=lWMDIIyn1LhSLjj9oHFxXN2Bc7CIYDkOuLRj8an6oOxNeQQQKfQuyP1loKTz/AE/4m4Q/ojJWW8o22kStfJb+oR6hG2M5cETHXgldhcWJIRwXN2X5QLtQ2aDWec70ZyqGCalX7blOQOQ55WLSxgO6c+JUERlyrnPXrN7d2E1rGgWMvuU2pnA8zZnj9O60YnMWjT9iWcfs+KxaEaydtgO/nWdRqKHJbetaQD0WiwFncfm0d+gTAj5G84nrm0Z/h2zfk5NEbjTqJ7ZyaJJaqpoKshrdTh0QBYyH7W2LLeg+vdslwfR2CIzRGgbEQ8NtubAXqlbS3wvoQXhLy3L0BBDNw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0089.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.34; Sun, 10 Mar 2024 14:15:17 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::228d:8c6f:ed10:82eb%7]) with mapi id 15.20.7362.031; Sun, 10 Mar 2024 14:15:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Mar 2024 15:15:01 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [AAzCl/60d42IqxmqAaEfkjBGbQvxqNFyRwf4+Ciz060=] X-ClientProxiedBy: FR3P281CA0002.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240310141504.440261-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0089:EE_ X-MS-Office365-Filtering-Correlation-Id: 024f11b5-016e-4df6-7411-08dc410c832f X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnrycYYMiKOh26ty8tiVyH4g+lNHMDwoXII+J/XOVljVJPSIB/YjJ3ieiXJm1iixKVS0n57p9rpQ+K+TvvszoH5Argakcm6MzKtDRjqlSrMiAlbyc3Lto9W/94l4H/SQsNlg/mEouq9GThUdcZ52+rut6nKnGcDt/g09ruEbUfEAEO4eDnd3EEgKffdjpTF/KW1KIPSjIxeaBqU2OL1mLWkhih8Z69m8f0iw42PqzL/hsHtt2pdevq1ZlO6KN8SmPoZCjso4x/pJCiSq9lYvDpV1DULot6KiuJrNd3h+NgmN/FOd+/gDmAOZXfF6YqPgLO7UP+4XkiQL+m75hFhv9abFtvnTfziIjlTPEl9x50eeMGl9Z140PVQm0+fEfm0SKVxIQ+yGnNvi4jEiM/8qSWOgayCv6BbZDxK6rEQnayIany/0jYTx5cm9L69Pxv5S+aSIHt+FO8klqo3goexTxnlZQ0XagGSk0uM3+uoiz5y+qGFVVIvnLw+By2uUrt9mQg7ovGD7yzTFsSk1BqV1tFgp+T57C04WVmGOJ7DGPy4ucOeSfVMLOTweMJVvS36k9tzNTlpz9yfU+L7+1lubSIIdpPYLWr96UiJe1I2SLQkJTV+PDcl1d1xv9YIHgfRP57+kSJlBOh4Z5yXi20Dy0Kbp86i2AMlN3lLoXuBrs+IvIFbkwMxJbT/ed4R+XD9QPJrhATKqqWShhUaG/tizwHm4AtOERtgSPSDCkM7SrIfz/uQR3Kex9A4iWE/lcuSBB5g= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qGeGO4OkZlj87WQqSnstRlSDDVeEmYmyRese7zsf4X/ODqp4q3hz9K1twAHtcyCkMNVhqnWBc7HtOSoEDCNC7t70mGcWqX5N7Hyng4WG6PevRkRIm9BdutHLfZx1EnnRlOYaSL3BcNR9dvqQk73ETusLP5wAVHqRYsHX6BPd4u920hGB7FEs0OrLu7hDO+HWRy8F7G2sx5EzPzLmww4kCeeTc98jGVyOUhxSqsoid/H25Ye0b0v0na4KGKu/HA16Rd9MlVf2v8oSh1swHvCMUyTJVes0SpOvy5tUIlzrnHtcGP+pP7h6GLFwBJDeP6B9sf1TYlCoQwy/2HoJeBttMPoLfBQ218OY81H91lRm9yaK2bVwxgz1RtKMmtTsT9vFYLjAd5tyU+lfGpoTDcBkqHYvp1zadPWulQ71z7xGill9I5eWgaIH/NjTcxcHYH/99ARI4j2PpZOso+ibylsQfY/gJdv0dApuYUiWPGgThdEKbYc0HjRSfQ1LKzMYq4dCPVHknKO0zNPQPyJXT+wamHoHnH14vKT2GS7w9KxWhmuzxc2jGy7a8y+KIFW/59KM2A9U4PZ0tkjGP8vRT3I8nu900pX+QSJWnKtq0Cz0IyM6kmpPoUhd2EpjqzS1LdLB X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VMn2uTbv6u2MzYp6vy9RXlMQczYU4d12m/VSk2xiUS311fLs8I8dJKrluYnkSfgvNP9ys+ns870BAeymFR0XlbX25Sb6wrB0oa/79kRFHNEaEaiYRTMAK9A04dM1jxPAoItgMEx9HPuB03bPo2bYqYdVi7z6ZQ+CwG9LeR4oP7lYLMhJdgaukdv71X1DFWjhuZxpEr/24Gg+1/5spG/YeWyyfYpgbHRmN/mMKm1M9tyXykoCr3xG3sEXL2G+xMLQg+mKsMJzvUNimubpN2MVEE0UekFZ1WXKDHzO8YHMz7/g5zk0oA4svqLWHoArteLgPY4SoWXnmT0cE7ddS5ASu+M5ubfdjVN1WNu8ehCahO8Aw1HFYezgfGdJP0M051qK5jey/KUhkZpHUZmloqz1qKsTd7LTONYOoxrj6CTi+1Dwj8s5t86MZ7amcDmB1glsWo5ai+QlQmEESGjO5lWMDZh73zQ7q8zJN8Yoic5MnEedxZdoxFsFWRBaU5qbM3w7h96sHE3hA+T89a/NcmFFzxVDKrA+DgALh2KyxAVO2pczmUAGwYeSiSswnqoQDNJjjT/mDQ2Ea6u31oBcRn1Xfy0YedHX4hkeTIJnw1JocBWqcNsug9xbd3/MREdHXBG+azP3SsCnOGgqIHGNjcrn0/M0PBhtQgserxWqlsPXbmR5614qoaoXAqDieYHbpcWnW6BFRwF4pootFwAxU0RT7nrDIzloeWmH2XSnr8YFUcH+t0sjHx9tr/+dQHoRwyBrlA8p+7Trc43RDIoLPTD+VMbDyDrqx6DUHq2/3kFDHJnnBuitdf1DmsLziC1MFhAq6g0wCneqbjV2DGuVkAMIH5wBIKpCfLrzHlDKeuTo1ukizBmCIvF1LOdbHPl1Nh2rzuwAx8yhQSLK72cFSkaWiJCp1bmRNfqVt4M7S14V6oV+IRjjWDowMhcoobZG0cykA9qhuSN1BGGNeJvKpJNBzjv3B2/t1hC9VWsBKon2rn2KF43RIH9ZIOxKYBsiNvl9g9uleKiLIx5YR6IFdKjzTiI+Ohs9XFxuxhw2oV5lhZbePKdvdXeT0Z4Ew3ldZTJJpBpPXdCcbF+9s+SkNWSYWNIGH9j9eBZF57eiuFrsxzXtSFu336YkBsjxHbZyHt4jsLESxHb7y5TUbo+qaRfgAWL404VVsx06Ri3cae6xW279e7VABVrbS/YFglrjlakYs8IafrkqdA8bfRhEsAObAl37I+nc1qK+q4smsWzBtWRkGZeLGmdMWaVAlja1pKqrHRTAUre0IZgT1BvJNS+gbA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 024f11b5-016e-4df6-7411-08dc410c832f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Mar 2024 14:15:17.8111 (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: AM8P250MB0089 Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/tiff: Don't check before av_freep() 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: S6fymNH5O3hF Signed-off-by: Andreas Rheinhardt --- libavcodec/tiff.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index afa1289e27..5d350f4e7e 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -132,11 +132,8 @@ static void tiff_set_type(TiffContext *s, enum TiffType tiff_type) { static void free_geotags(TiffContext *const s) { - int i; - for (i = 0; i < s->geotag_count; i++) { - if (s->geotags[i].val) - av_freep(&s->geotags[i].val); - } + for (int i = 0; i < s->geotag_count; i++) + av_freep(&s->geotags[i].val); av_freep(&s->geotags); s->geotag_count = 0; }