From patchwork Thu Sep 23 15:28:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30503 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp566500iob; Thu, 23 Sep 2021 08:30:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjBe5R9rN2LavPEboo6VlYB4e6/goTL2eqdg8kjeq1dSbCL4l3vcq6gbEhiLisXyUI2moX X-Received: by 2002:a17:906:9801:: with SMTP id lm1mr5606060ejb.432.1632411033663; Thu, 23 Sep 2021 08:30:33 -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 jr21si5983066ejb.14.2021.09.23.08.30.32; Thu, 23 Sep 2021 08:30:33 -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=ZBPUtvIv; 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 19BB168AC3A; Thu, 23 Sep 2021 18:29:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065047.outbound.protection.outlook.com [40.92.65.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 985C868A94E for ; Thu, 23 Sep 2021 18:29:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cQll1ClIe7YSCSXFtzw6cA1EkmXl9Ij7Xrs8Ghxsn2sfBACksamwQAtue8v7GVgxkPCC8LnLTwiUJrPr4Xert77M7pO8qng+Q7TObUn7nkZ+QJW/mGGoQ5rUVNr5kNg2lLyLhhaRcUTxgNdZWSCPWqvZJhyVhU22NGbPA36UtEBdGdKwkHicx9r5x6yaTtaD3Rc5EOdRvg4Sm49TZovM8ekha7rQjTmIjmVLmnRqsv/7R8vOh0cQN3GaCVzxiS83qzCY2OD21ZLgkMoziJ0hMLoo9zas/nrk9WRwQoz/C6YP9oOn2ABevPH0FWhGAeu6UqhBXguDlU9teaEPw39L0Q== 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; bh=2Tmmi3KV1P0/updB83vKKtTfP2pGCLQX/XwsA8gNd8E=; b=in40kk/Em0QKJjzd1RekglUKgTSANMgKeeTFF8drYK4WaAx/WXq0wkji0hwX3t7Wwz382cic8dZeFLz78mDQ9qrnEpPAUa/VmyVthRJ26RzmutmOu1ZX6/Ij88eUyrhbyIgx66khCbn4cc/2C+t9juHL5kxvqIDfdl1+QCNLC4GWZIxiXFrFXuGlLjN8HvZnEHP055TFAwUwU6qOUPGNxGZoza6ShYBZSXUoCGGrNeHrv1CFCUb4WblcXw0+TllQll4zdYABp2/3P1o9wa4V0RvK/Q8v5/uALXEe2vOyapsf9X0WS2BXtiSN8WmfOjQpbBl2rKEemzCcrBfnXHHkBw== 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=2Tmmi3KV1P0/updB83vKKtTfP2pGCLQX/XwsA8gNd8E=; b=ZBPUtvIvTCtM1KDSve/uOi7ZMbkgZW5SmTt/ncsr2NoLPX3lk8XL6Vpc3iQE2mPkr3xLcHx0Oj5SSeMYl5i3m0rJbA4r3Cg5v/dVTRnBPhCjYgBHZuLC7pddD6bNsvwB24TPOoBNCRjUu+KgiQhVm7cfcHeZzqNvk8Q+eAwU0HfIHGoI7ryIyJmH+Nf3EB2s8D61LmopAdyYUpFZy3h7z7kjNBTEcq3p7SCmz69qYRy2FA59mA2ZRfJhKOXtixcH3/JhFn0Hv+joPS8xEehkdCTwtUNA/50NH3ipz2xfiKt4Tb7eYjokrSNpHoQQUnrEgaWtoR5J1puvJ2bfgkqRCA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7061.eurprd03.prod.outlook.com (2603:10a6:20b:295::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.15; Thu, 23 Sep 2021 15:29:26 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.021; Thu, 23 Sep 2021 15:29:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Sep 2021 17:28:43 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [C/2+P+jVfRRRTF1/CxxdLM06Ie9TMBtZ] X-ClientProxiedBy: AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210923152902.42865-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR06CA0106.eurprd06.prod.outlook.com (2603:10a6:208:fa::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Thu, 23 Sep 2021 15:29:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 87f9a704-957c-4da1-2d7a-08d97ea6edb1 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWt8qMG3IjM1pM+gnFiFAdPc9+bUUgOfICrF1lDhwAOJcdMfeA1M6fmyOMZ0nOqMJccmK7xCvKPFClXWP+V46QDjT0n8K+z3+JHalmy5MisXsVzuTODFCike8sIIrgCsivVcTRiSkLjW5aIdXjEd9OQ/cdsCh7FZJF7cPPrWRMvZktNVlCj/U0ZsuIVb/Ft1ANgqCCo9ANYQIxggyqRu8ePKJ+KRXwHesGuPVYd+g7zCXR0SfOH5ZcnUCFhEr9H4YH1X/yf9PW27A7Y8Zm46mUeX3HoWM43JDeMZz4m28Dd6zguufBWZbE5BVhVjn4Zoe8hJW2GEeD4MGD+OrfoBSvyAi+MJ3NdRfGUPYXbwFN49bn0MHLXq0cJiDPSYJr4F98/74mYhaOh80jsEPgBxFMMmRXmlHiPjVUbLEksoKJyGIx1omBdrVAY2b3hiA8TG5vK5BDR7W2BoHJGLpI6yS7PTiJlp2a6Ihp44uff7l9J1FXhlGnXme0hz61e9a2l3I2s8/pWGbVjLAYU55oko98ikrKsbf5HNYB6moLQKcldukqx7fSOs8DO8rZrNFGesYNzBEQEg0W0RZwc/Rx19rPOBOWzBMh4GwhSiRcTo+K3PoSaRLuDCT5Naj1qWoqmLqHguUd7XWxVVa06GGHSeK9ybbuoJqCpa+p7lY/HF+9fTO7f3bUZ6SpR364aTwRgwZpVxNxVx0zhl+K2GjHrPe+TO6E0S2WhP1g= X-MS-TrafficTypeDiagnostic: AS8PR03MB7061: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yUxprw+jCkWmx/i1mODT8O0cVjQ3own8jhCuSFAOaxJDw2HYz+iR50SKlALveekqA09RVk8uZEz7AOSePvn8JToSQIV/fnSkLzmInQLRwYk0HIndoya2O6aVOXJ1mbRGSUAyVi6qN3STd9P7SZO7P/bzR39gwy0jrJ0aeA4YOZfc0Kqb6pE2o1lWc3hMT2jx6Oy118+EiPvHZSfONWMqFseJ90lM0EANlYOvWDNofb4+OZXAXlD3O2KajyRoe1bGCbPyvyyu3mL8pX7yawCSSULEX7T5JSSfJ4V/NmXlZ8HB+Glhvu1tpsU1fQ09jfZ/heMk5MYTLpG5uH0lMNjJ4v67Tjndp4wZsxaac+IvsdmZAUXc1eX08u5Lro6dBipvzakkPpAg5O4zpwbUxxQf0/VVvOBt9Pj76vXyFkeVymQNMg9o0pfxp1+VmY1tOMGk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vqqSporDTn0tfZxrIf3+rUaEpSFBmM3mTuLdqREwyjfvFLZLGBKSoJe2prFEdOTyky+OiWczehVMxXCAQYr1Muz5qNvGIYumdmUwj7siZ5xsDeVB0Ax7u1kLt5IkT5f5ho6HR+KYGypEdNx0+b2ZxQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87f9a704-957c-4da1-2d7a-08d97ea6edb1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Sep 2021 15:29:26.9109 (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: AS8PR03MB7061 Subject: [FFmpeg-devel] [PATCH 08/27] avformat/cafenc: Fix potential integer overflow 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: B/YZXIGOMt2J (As long as avio_write() only accepts an int, it makes no sense to try to support sizes that don't fit into an int.) Signed-off-by: Andreas Rheinhardt --- libavformat/cafenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index 816e978945..622ae14264 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -213,7 +213,7 @@ static int caf_write_packet(AVFormatContext *s, AVPacket *pkt) avio_write(s->pb, pkt->data, pkt->size); if (!s->streams[0]->codecpar->block_align) { void *pkt_sizes = caf->pkt_sizes; - int i, alloc_size = caf->size_entries_used + 5; + int i, alloc_size = caf->size_entries_used + 5U; if (alloc_size < 0) { caf->pkt_sizes = NULL; } else { @@ -257,7 +257,7 @@ static int caf_write_trailer(AVFormatContext *s) } avio_seek(pb, file_size, SEEK_SET); ffio_wfourcc(pb, "pakt"); - avio_wb64(pb, caf->size_entries_used + 24); + avio_wb64(pb, caf->size_entries_used + 24U); avio_wb64(pb, caf->packets); ///< mNumberPackets avio_wb64(pb, caf->packets * packet_size); ///< mNumberValidFrames avio_wb32(pb, 0); ///< mPrimingFrames