From patchwork Tue Mar 15 20:03:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34764 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp3312283nkb; Tue, 15 Mar 2022 13:04:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzud/GQ3eHPzmDRTb+S/6Xq4ZvWYXV/1gpA8ymsyvYTQqWS1t2/Hm6E3h87cN86GjMwW4aq X-Received: by 2002:a17:907:97c5:b0:6da:c285:44f5 with SMTP id js5-20020a17090797c500b006dac28544f5mr24342136ejc.208.1647374676368; Tue, 15 Mar 2022 13:04:36 -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 z12-20020a056402274c00b004167e4606b1si27186edd.266.2022.03.15.13.04.35; Tue, 15 Mar 2022 13:04:36 -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=EJW5Ezu8; 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 EE74068AB48; Tue, 15 Mar 2022 22:04:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065026.outbound.protection.outlook.com [40.92.65.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 91181689F20 for ; Tue, 15 Mar 2022 22:04:23 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dmtBV6GPabrSFgs1p8jOILACVpgwi4LddN3rs7/lYxyMeINNN3IYKRoxsdPsu3RBH0TV1PFsNAppCfdJDa0W83azqEkJZdyVl+8Ej0BiE32IsmCbNhMAzYAvjHP5i4Lf1l/gkSe+lCOyKqc4wevv8xab14xnGIX4293PwFfft6ys8H41uUmquj71uV78yAKK867++c5kFNmQka7AzEAyl8g9tQsGG7Jjo4daPukyTbbKFkq3HTS6Sd5ftlcCmze60BNhjV9xh7C7Yi4DA+jQ2gGNX8F3UM98VsC0NAJn2eowD/wZz6FJUd+1rNN0xrH7AwRUJ9Sj/CjKjWXrn/ekmg== 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=phdFaY3M4UgEZJDHtXq6DJgkAphZRQiZjQY9fCch1Iw=; b=Ncg781F2Uip8cmUbTdJU2X1DX5ZhV6PptlEh5VJLx+B33TbbrHIEilFxLBCOdCRGYH/Q3kVH04UEVs/zhe9CS7xWxbUoRTnoLja/JWvSdUbH+TnKbXViBXFB0j21J8yTYHvIZlzdrUlQBnBbi/WbD9NmOofgG1+HuPuNGwCAE2SrIhwPhucLlvEc0uT724eZk879ua//N5IXh7JRQ1OcDxD05K7HKf+9IsCcQb01nZlemwS99X8SlQYGm51LXm8o+7FYSMSbegQwDPuY3+Kf5QhRSMnGa+NdpCBapRhxWv40mY/5hV5eFenhQU4kCAUFreTyIGJCsfCH5m1oV5gYIQ== 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=phdFaY3M4UgEZJDHtXq6DJgkAphZRQiZjQY9fCch1Iw=; b=EJW5Ezu85sLF924xl28HQRDBkOKCIhgCKcQgdhqblfVkbklk6CWx6orrjv4RHT0G3NP6T++zOELHHJCcwc1wP7XRvJTyI8tNzuHA03mCGVU7ea72fTw+fdwapZT2YlucuIiI+Pk+OFHxsHbq2ZHrN9xq0lrMPlSV6SBqTP3lJed40VdsKLfD9reQvuYcpTqsvaeyA17cjGyCka7vuJmWQYBp+GcifBLMl84VuM9//UleGzhsbaWQ0Q+g87WBDPZJ2jFM7jmirDkxXRnZYQOOLJmNN1396nls/Ufhs7G2JCKE6G5Ti32Lc9JGDyT6sRdE8zdR248QUD92JE+pudoXCA== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by PA4PR01MB8947.eurprd01.prod.exchangelabs.com (2603:10a6:102:2a6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.26; Tue, 15 Mar 2022 20:04:21 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%4]) with mapi id 15.20.5061.028; Tue, 15 Mar 2022 20:04:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 21:03:54 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [0MwekPeSFS/gdLw5Sk8qbQnQUBT4FuUi] X-ClientProxiedBy: AS9PR0301CA0010.eurprd03.prod.outlook.com (2603:10a6:20b:468::6) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220315200414.553385-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 828cc0f8-44fe-4b60-7983-08da06befebc X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVf+PcTdbcvjaDtfbcUOhIAbqfJVWu43yPuA13GZWSVWJnOy/alZWyGrZNymGO5bRmUQZoiDUc/EKpUC596N5GcPp8mM9eZBk6Rd8B9LgEB6hfCcSAyqY4zljSi5b69+euh5yYAHRgiWDliyIVQvmxKgXKezedLdlq53tlkjfn9yLnI9YkTOBwXCIZIdeszwpGbQlO6snfVCBf9gLZxs5Tv49y2nEffYzQeylN46yV0sNmqnSz8wK70IvDOt0Shn2dE5wqbQm7gHNdnlL/YYdUDj5MWXVhdkdVWakKwUbHmEV4gnSxj5jPsHCekVZp8bd5MXA/k6c7pOcWvdzmUB+9C9IFMjxAugvb/HaqPWRWtSMeOrrVx2TWayY/JI7HFbhoc4IhxiS47AoKkHEIVZIsEfUnQ2X/XJOkbzzFTskvGOLbFvSMoEvseggpFkAaszjbQFcegoTxDe4bcK3kPH3bbA/9GQbttmkrfOeb39PBQfrLKSO5lOzdxW2Q4dtdf9sMJoabWXgII5NFGHFOfJyNAMG1XIlnBb2dkj2Z7e7rf5IsNPCAs5aH5m8AddjJg+c7K9vA7vQycmmT0YKoqTx9VWm+EVl8xDMw7YJqaRd/wydgdw1LtVOw6g/0mxXv2KNgVkCUrytbk9gaKjMjCTm1wUKdHL0zGN6S1FCNtN1L8jII6MGLu+5w38wbpqhH7rC6TN7fDsKVldPJ96LITyRb9O+voAkYX9jk= X-MS-TrafficTypeDiagnostic: PA4PR01MB8947:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IkeQd+gdCd1kY17fpZSEYKDVRFxo2fou9/3d9AVIIZP19SKW5X9MJWn9iwSHxAODfs2PKmpmq4l3i3sncGrUeNqY32xKJvgK5ygW6o9tcg1MQTejWc+H/Zt5pJj8tyTqRpAOrm/reUs5+5e6XNnI1OW2HaezuoP1BjizoYFAbsW/KXEjp5j9JqShsXwkujLdvFVCwe7SzhMNi3DfbI035aXTv9Xhku2POVvFJUyoLOXBemEQ244TV5j4MiW+B2gcIQmHp0b+HO7lXl8x8fg1vph/YbHmXioxf+dJkkYx6xCdwJwfbf3EnNUZEZHuNWC3ng24Sj4TNTDJc2q2XbjcomDuRofHtJu7CjglLQbtzabKXy1a9IodeRrOq2ypWTaY4ZR4jxkac4hMI3b6WaODaeO0gMx2aMqcQfcnFE418cagUM/KuL/g4XNNg8XX4i02cwIy90TA0w6k8sqV20BYcyLNkoTa7/DCjQBsACH+ogGGfTnPIEvyjqay6zZCMUQMJ/NSV4NVgmYIUsVkAW5HhqjbTOwVx/BH7MI+0/vbIEFJ4zn7Ikhv/g1CpnZssZ5DiisLs4xthiRbKClPihHKng== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZoNkVWrslL1m5IPscrgx02wE7/KcmLrmfGqMpXhyg2X/N1FrRfjjPPvjCCWE3ySzWsy82vTCan9ov8+KvUcrO9sBBrU9g3L4LNtm0UW+UFk9UJlsPKlIc2FWvG+xwpQZHUQ0OZDA7hmZ9n4AobZfKIOVpCrs9mhcrPOkpFsM6n7tqi3VqJM/mGzQ9XIsXl58NsAwmYQwLfrTnqDqXioOW+6qJP2j9AV56QMWY4WoBqOSHk3dFnqbpEPDnCI/XkRFpX3Lv0lDKdKjfZ6Q0jcdde0RAIJgabuyv89y1yiOmhdtGe5cTVYHudGFj0xZOgA2Q/KcAtVVB+vA8W1BVyc64gjbl+c0fAgEEbU+01WkQLvfotlGmLHi7BdbfWd7kX7kif9X0ynTXU3hc4efB18N5zoIn91F1LofyJuSe8iz0bHmDpOf676JHXyJhRdriAHjUhZMHs35pFHS0Klpq41Fco8NjKqSaIez7vd/EeNkiYrNo5BOCshjviQ+bL52C2HWaOwVeMNpAQM00vuMrYe1yCpcR6eGEmrea7UhbxbLlpk+gWn2f+/aUyTEhOLzFFCXaOO8DM4Mnliz238+xnl0z5TvYKdqQBmn46IsFrQEUK36SSZUxUAVKxQHmDamJR8YWnmPgEzLQiATIHrmIIy4aVbdSJNUQYuAuqoVyuL11zfCcfoWB1n8i27+YCYlJ8RVLyKT3FcA++Lz6umnNRbEYWUhlvCsNx+jQjfYKW8BeUFH8ICq066RV750lR8rCuOFFzICgiwz6ulRA/F4/drXGnhcUGa4IENBdfFa6PNwfb3rJNx/4JeuV+VHSKmyaaEpgcZ6YJaatbrG/rvwpUdHnrflTloghgJTrQ3inr3UG+Yir/FM0Bysu9gC0KqXCvFmFM+jDGHYSd1Qh/rzOk67gLSwzV/QruPVmsKyGRiZGVqQs4Ddhv0znisVO7aLlpPdpjY0ETMS7mkGBTl8qniGPcKYWsOAlOJxLhQHJB4q2Q1gm5kNO6fOnzkwxu9ela+I9kPSeHppmCr9tR3HzwXWQ40375Ve67mQD0buPsJLCVdLFu+Yi+/oKbZL5GcecsBb+u8APJ+ochaol8XP+essbbh4JhuzteRJmOtcANxPMlGfi3ofxWCpVt+QVpKYtcvVXuCZqztWywtGt6vq/rsrCo31HajVyXAbMu5aC+UwEQA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 828cc0f8-44fe-4b60-7983-08da06befebc X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2022 20:04:21.8350 (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: PA4PR01MB8947 Subject: [FFmpeg-devel] [PATCH 01/21] avcodec/pngenc: Avoid potentially truncating integers 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: 8c+s9RLkq2m0 So use 64bits for max_packet_size instead of size_t which might be 32 bits; this is consistent with ff_alloc_packet(). Also remove a redundant size check (ff_alloc_packet() already checks for that). Signed-off-by: Andreas Rheinhardt --- libavcodec/pngenc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 3ebcc1e571..64a9f5cc95 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -528,7 +528,7 @@ static int encode_png(AVCodecContext *avctx, AVPacket *pkt, PNGEncContext *s = avctx->priv_data; int ret; int enc_row_size; - size_t max_packet_size; + int64_t max_packet_size; enc_row_size = deflateBound(&s->zstream, (avctx->width * s->bits_per_pixel + 7) >> 3); max_packet_size = @@ -537,8 +537,6 @@ static int encode_png(AVCodecContext *avctx, AVPacket *pkt, enc_row_size + 12 * (((int64_t)enc_row_size + IOBUF_SIZE - 1) / IOBUF_SIZE) // IDAT * ceil(enc_row_size / IOBUF_SIZE) ); - if (max_packet_size > INT_MAX) - return AVERROR(ENOMEM); ret = ff_alloc_packet(avctx, pkt, max_packet_size); if (ret < 0) return ret; @@ -845,7 +843,7 @@ static int encode_apng(AVCodecContext *avctx, AVPacket *pkt, PNGEncContext *s = avctx->priv_data; int ret; int enc_row_size; - size_t max_packet_size; + int64_t max_packet_size; APNGFctlChunk fctl_chunk = {0}; if (pict && s->color_type == PNG_COLOR_TYPE_PALETTE) {