From patchwork Wed Dec 8 20:17:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32204 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp973284qvn; Wed, 8 Dec 2021 12:18:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzlv6XgsYDi6N0PLQZvZTgXJgxbODp4kLEEF6KMV06UlFRQ/lmJihgD/s8ofyB17LBsVFOM X-Received: by 2002:a05:6402:4396:: with SMTP id o22mr22394673edc.263.1638994681494; Wed, 08 Dec 2021 12:18:01 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g3si7923208ejt.101.2021.12.08.12.18.00; Wed, 08 Dec 2021 12:18:01 -0800 (PST) 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=NYYXpGKr; 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 EE5E868A842; Wed, 8 Dec 2021 22:17:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072059.outbound.protection.outlook.com [40.92.72.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7341F689D0A for ; Wed, 8 Dec 2021 22:17:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZYwbiKIhD/VP01GsJlCzEqwlgfGqyLsjw7GKfOA/zYHYlAKwArulm9xy0ej+zgOPWJupnPzZFqZXFAlndUJ09go2KkHPqRUpzcmZklNAHUn00d2tb5M74fWfhMdVCPADDJRFvh2G8osgBeCgL3ZQFs0Bb+PeWVO65OOaxKbxGRyk2jrdQIze/l+GO+nzj32Y9odXmk0GTHehzU4zOqTVJEceMV+GUlH56BDOvsX6fSifzv+olWqsncTidh3sd/hYf5XiR77V+ZB9kCjZhSjufceNOlp2mj0Mx0C+8qwxvjwbsYmUDAVsx8YtBJ1BrKWzsRZnQvULcJ5AGgfsTJ5kkw== 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=DYmgVvB+W4jnc0Gi8JRtT7yXJDeW6dXaPwUjhu77vFI=; b=LOzArEQ4Y2MdR8ZCJklwllaILbvzqPsuv28CIncFCUOsWTMDj559M+L6f5ruzIXuLNZc/xJdpsxoadHEl+59j1Uf+fbG3NrZYY3CrjA2YJBaT4i2lhrMNRHIJBxUGTBBpYoDWmfyq7J8vwngSd6Rm9Z6FnxshJp6XQOL8uoOo63NGvQ4+GLnAFZK97Kg5TlWK5ExpvMNIVUUTkrHJXRcxpOFzeCC38lVMVonMH8bsAKYvyBoLZ98NSlHxqw4gUZVXh8WdizV9gj2Osm0KPSDS3miMNtUts3CrFGd4T+5csDzgeubF4DodXDHlHU1lvGZvqf2o8OuMvrZSAxN6wBa4Q== 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=DYmgVvB+W4jnc0Gi8JRtT7yXJDeW6dXaPwUjhu77vFI=; b=NYYXpGKrnAc3ZobvADuKbNj/X7Lsl3CAH//KE9OcYfy8CeVJArXfa+r54wrAIdqIxyQJ5omhdaFNG0p+iG9n4d9dXT7uE2V86yP2oL5tmv0pFQeJaQzrTwsKiOQCLEoH5GAexSRgeAVrPycmoxSNAh58EYp8LaaMt8sGewBA+CJzJxSVBhZdSGMe45mwULCbYTRCbFwncRLT8nRF2q5YtghyHAdWpZBsmka/5dGXICQ1jUSvOYaad5E29x9D23/S++1cBcqRzWQ9pwxFjy4K4cp1qLjruv9uHqXppbFBn9RFgBtr8Jz5t5aZg9pvSiDqe9rQrEuV42xCkluRFoM9+Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3319.eurprd03.prod.outlook.com (2603:10a6:209:21::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20; Wed, 8 Dec 2021 20:17:50 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.024; Wed, 8 Dec 2021 20:17:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Dec 2021 21:17:38 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [LP2BBNNCj98KKM0n4NyVSuZUS++y8tZ8] X-ClientProxiedBy: AS9PR0301CA0043.eurprd03.prod.outlook.com (2603:10a6:20b:469::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211208201743.593292-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AS9PR0301CA0043.eurprd03.prod.outlook.com (2603:10a6:20b:469::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21 via Frontend Transport; Wed, 8 Dec 2021 20:17:49 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ffa3685e-0fb7-4e6c-a3d5-08d9ba87ceb8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUJNPNrsFw39+IRsSLFO7mftKCt5ZIYOeuatLqoQCeFzx+yDzqC7Rphpuv2Ivpot1dUQuIQH1NqXI8mOTuDNDYzuBj+zwhlY3f7mBLyF6OZ1u1qsJaJriMG9w4U5QYF7t2TRtyH6hJRSVoEsFAI8BA+nGKTq8FG5OApM/q1CmpnMQQ8QI3RcPH4aufge768o4BA+JoIq4qLNctNsh5a+AO8yDRmhs7TysRG5mJkkJ1bXvoCGBtAGKxBDn87LRqMeg+g8jHc/txKuyibmJGgkeIDL5Qf2Il8LZ5FcBwnRkMXHglAhQ52b8A0UomDwYlMe31Orl8tSIy3kKt4oUGihdEAvCjzs3zFmqJhkMCYc+YNBycvYuCLKFJoaS9PRw2k/LWn+368m/3wVT01j5E/+ni7hccCw3wbE2XTH0Z+X/QD+bxGjEsPA/zxBdb35MwfnHrRTBBG3cGUGovgeSdHcqKw10QzlQBLhqIlEJn3U/XDl6iSOQGRmtL3otCE+lVX3Y9xVtppDRXgAodeQdelLnmj5U3oj9Z6i0smrcMA8DjjlUmW5JSA/PYSbzKsqoARiEIKm03u16gK0O3In+DDUtv5Y+oCKqHrmNKlDTesofCEwqnyB8wwxm2CIzmeVMAs1SDZa43C4pQdngInysU1hOqU+41nQSwhL2eOCouxABtxpyDqrFtKq6WIu1F3ZkApOmjkh2N98KoQkBNzUidipS73y3lpjGXRSTg= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3319:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g+ozSUhzhnnlCTPicCJmGk/vXpnA0FV+nJ2mO4zH3lMyrBTUQPHXkHRFa3+9elqdikC+pgh4xbwncxvD8XU2BW3tWjHFhANM8BpvKrVbvm81RlaHz8bGzeSLUCi3Wc8odV0MhfrFzw73Ayun754YEkWE5gWVMM0vTBKhBbRAN8Do75yfMGANpHZTjAW4PfzaSugu4rUagW1pSft6g3WAtHNZ30XDY6LYqkW0kSs4/NkUQ32rmWoxZpWmOIJGctHHkYvXP2Osz+/EXHfHgJKP05dGH/JFk6kOrTUjeleqvSeETLEvMtxdexrbhyHfMX3v9YsWyB6DyMsbdf/H5EuyiC1uPpwaj31McrgJ23HifcNpM4rTDaQb9wH/GBOnk5lShlxsYZBsDYQunkOUHe4nbr1QFjcV/ThYcLDh12uWbnid5apeTz2iwjpvWRLGhXGk4iwDtN5X2s4f8i9Voy1nE+ipiChrLqRoTBJjcB7dY7I7Wq7ISpFZ5kcf5cnJSvckHf2sklbPmoT357ts5L2lY4uJof3wB92Zo5cD3o4iJUYiM8FW02mJ8QCRYrw14xIoxWpYJwTqhAnAVA0vGGwqhw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VjjMZmwusHOAP6+zhqLuGI0pfmAO14g17fZkmKPEISqFJkJq/hN09/a/vP4jTetk/xeI81PU2gQODRr6NkEDIAPCjWtXg7I2RmO6T8mrvELFwAq36M2lGWlW9Y5WzcL2BBIkKykU2trsXzMpdxgErFvzyXA6/6O3Wm1piq3fpUCg0mwFNRFt+Uqdi004Wf6qSAP7YAf4Mct4i7hpu8HqNMBrLj5kYbZMD1nlr4x8gQLPJk9dHBa8XwkTILw5PJCqcetnyvb/UJrz66VB2W0JUG6WTDJC/GbdotirSk/wacJ9z9RkSJ9gKlH6FaIfEjXZsxFFgt2XWLD1eggqfvGceOsSwCpWKij+ZbDalmnhoUm85F/bC6bXMTcKJWqdnyhOEML0KcNfAhPf6unn3i0bnUKSBNAuZEKNck8/N5XuO1oDiELf0und7QOpDyBSzqOiTGT6VZUelZ4iGkcUN5KeQB29CUgHody3LU+ZuWl9BcE9TweCMZQ+5NxZy9trq3T34C0/mAMSlmnFoyBOouAuAwIv8eyjMoB8BdV2IxvnNXxQrEycYfiUbB8J/+ZlG+DLlovWahvLyk1oNI5w5DH+nvKTZX6UvK+wVZIefIoAZZJ7oi+6hHnvO1LpGPVcRmkCkP88X7lxhMm3SEMj9N7NDVmOOCSREsXLfapUTeJ9DfKVzVvwcFSgbm3CUA/8vpIyb1ZJs1YpgvR2ZzU9YD6U/oKOlxdHnC76lyDmGCBLU95iAF4euAjX2OsgwQT5wzQcVELKldKSqnbVZKlkIaou2hNmsU8EXZOEc/3zSBpFf/HALUyZtujta7nXD+Dfme4gl5vaTzD1NqnHBmQ8Zg+iwktHaSzoBf8KILdq8rEgU4VZ3No9mkfUzvxO3jusFcD0Vd/Bx7YHDK92pLaMojbAUxnApqStusg30/XCqchBAIcL2GwUsba1C50XdOKGhS1yD6Hn0nOJjNGMStUraq6aQg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ffa3685e-0fb7-4e6c-a3d5-08d9ba87ceb8 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 20:17:50.7000 (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: AM6PR0302MB3319 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/movtextdec: Switch to smaller type 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: nIoulwbfF8zf Content-Length: 1035 The base size of a box refers to the size the box has in a file, not in memory; so size_t is not their natural type. Therefore use a plain unsigned which is smaller on 64bit systems and still big enough to represent any conceivable base size. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index b0c54bf1d0..8dd571d64c 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -111,7 +111,7 @@ typedef struct { typedef struct { uint32_t type; - size_t base_size; + unsigned base_size; int (*decode)(const uint8_t *tsmb, MovTextContext *m, const AVPacket *avpkt); } Box; From patchwork Wed Dec 8 20:23:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32199 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp980583qvn; Wed, 8 Dec 2021 12:24:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJx11T6HkiqLfoGpIjwjWeMBy0HT7kppckuZR+6cA+LSaeBDaqqkDTbUJSoOTkIN7yG+QuyT X-Received: by 2002:a05:6402:8c9:: with SMTP id d9mr22279157edz.254.1638995061784; Wed, 08 Dec 2021 12:24:21 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id he34si7035222ejc.421.2021.12.08.12.24.21; Wed, 08 Dec 2021 12:24:21 -0800 (PST) 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=tEEVW2Ic; 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 11C7B689734; Wed, 8 Dec 2021 22:24:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069030.outbound.protection.outlook.com [40.92.69.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD131689734 for ; Wed, 8 Dec 2021 22:24:09 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I8GHN/FBgFm8z2nUaE6Dzi7fgZe9VAEmZeOPZHQ7grMZhVZUKshd7/FK5Qs8X33pQ0qEgxVb2ZJLhCP9egWIwBaWDgK59qig6tTQYJxYGj0yaL1tnlHv0vbvjC6IrYjn5HOcoxB2+xLvzL+vk8v9P7wBmL8tZhlXc3cfIlgV0ddunQ389mzVZFwBr1DJgO0wv9DleQbVUiYjFc6xBqDBCvDexFt+xZgg9+cxI9RtEZFkdwdpvrYqL4Lfugx9vB2vI+bHSWNWcV1TSXzJPlv/Bj1lgC+z1KpBoX94F1Hf526TF21QfzhXtgTw7sbOBp1gr8pukm5ZDEKh9NK+AavHCg== 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=owgci6O4Iv4PLlzJ2xjObp/rY3QVMIWYEMw41nVTbbY=; b=lTxiRnfptYA1EpE4SVgz5du25vTXX5HZDg5is4vhN8B1R4ldKdIYhE/+w4oA+mI2YLm+OcplPMbxM06hfPjKvL/98ead+BySjJgDbMBw9lRU5z21DUTZBK3hzFSL3fhxz6/bxJAlIHxIG716KlpDy5PEMwQOf4wVtGGgt8L3vhv5wPq3O8pbySdAdI06YAmOgYPbRcKw1ygemKaSKe5ZImXBJ6xAx/Au7w9YShyPFWYbP6Iw7g2YBXoAxBW9Yc6LwB/jtmqdVKB732jvjcJeu+0CNQZBt2o7ZfFIgTYPE6KOEx0hRkfeH1iYfFL+Hd86mDlHNyQTUG4Kd9zHJqfHIQ== 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=owgci6O4Iv4PLlzJ2xjObp/rY3QVMIWYEMw41nVTbbY=; b=tEEVW2Ic2oOIMSNfOtMS2p0ajgmONVu/mBlgK7EAnNTQaxqb3mhWR0AXjizJugHPWJlHc1rkiurKZHSfp6CvV4fCbKwNHOriXawMgi/6JKS0v28vGNOZoh91DGrFUEXaSFmw6XOSg+B3fX5jWTD5uCnFOpTKl6zouIB0PcR3eLaZqbNh0lUtYVVepzACf5BWvICfbXteOF4NdIDj/ez7Kwqi+/xn+HBVlDiDkmBU2u516m54BXsyqlWpyYWx5rFqn3dcOxqMGzDdTYiWm91ufMNzYGNmdW+OPkz7/9HFkrJPVbLZmgbvhRiWgDpDGIin3ItK6tU+u8whyPympiRDyQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3832.eurprd03.prod.outlook.com (2603:10a6:20b:18::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 20:24:08 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.024; Wed, 8 Dec 2021 20:24:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Dec 2021 21:23:55 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [0vcHNe5WhkXh1IBzkDXfqi0fiectSjRO] X-ClientProxiedBy: AM0PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:208:fa::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211208202359.593906-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:208:fa::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20 via Frontend Transport; Wed, 8 Dec 2021 20:24:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85fd606f-c911-4a16-88f1-08d9ba88afe5 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUJNPNrsFw39+IRsSLFO7mfcGYzvKkuOyqQUvHHObNiiAf5B4lE2jv+TY2wxvbTvLhUpvO6omz/qVZK7JCTQuILMKJu3KDyesgCFLDJHBDOJUghLOtC/piTElQwPb/rZ2ZcMB673uWBv6cI1nrzJ65i07jyUJmoyX1OTP/wyLHsLbFwQ6rudqasjttkRuxGo5b1xEgKLxEx/SFC4uTeJ0jfykz6GVd1+wG+5fZIzc8K3dgCORdv6WlxlwwNcpq2xL041ECG2sL0IBYM8v/tLDoPVX7cvdLRE7RAqCtea7R40Tve9hVHGrtP5Lx0tuyyxhjEO10R53Y3gAvFIvejh3KXKIpympw7G8Slv7cM2VKytg+13HJXyzbvNKvFb+TIcxPtXGZ96FF5tgLErOkak9SP0g76e/2jVyPuFLWOt6JjRxHDCZGmNnYyUowOeskv+DER3zKYoHU5v8hyI7QS5NV1ftiiu5HdQgpjxOXP6dG4JcZq/N8HpJkxe3o9RqDp3JTh8ASzxCFFymGgxMqCsAKFEhHUfmSSvymGmDtj/gMpPUDMn3w8wfxvN0Z+N+XTx7eOUo52aTzTPHYRmNNRXFAx0v27wF3smN6cNu21zssSpHehH6QJU2z9uwbEJ4YqjKUEWjetdM2C//iPiZ/0tUSwWkcPfGk8UU5w+C7e339kLeckj7OyKraSjL22bC+aCGHoDZ5c22w2TNNIbUBiM/H/hRMLalLH4CQ= X-MS-TrafficTypeDiagnostic: AM6PR03MB3832:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7oeHvBjkAYxRNF3NnN3WL+0Dje27nyzDGXhgLWdldzITXTgFFpTr9/76iRGKwBGNkwXMUmAFUN07VNWRS9Pg2fs9d5xOgfAXpr8/OGkFp0eLBCBOqm7g1YyhETa+oZg1ifrnQps3Cxn5KYl3v4YpsDj/Fl9K7ABQVRDFbkxNT2FSVVUwmmzi4E/ItsH6GtkGy/L0bhF2sZGd4rswYRsCkRVyGdKUMXK2kN8xzwWo4SPtFvtP6bEte+TL/zqegHbx7XHuqVL37svTrEtehPl1v6kx0XCMMtrNIK5m/cqfYkgyu3RI4pI4tJjcbuXHwac6AjH4dNAuErK1DvkelfMA8UUZ0h7BXPP8boi2RMI+h+UZ5Hqpbb8onPOi3vReBsrmRTodZqSXyihnmFDQbGmv/earE9kVIbXKKjcsUi+GC9BgHOb9pm1soMuxMW2GdYUK9h3EMLbGbnf4rBbQZ1m2auVxc7yC3TeVvm5gitubms0j6mvUGhaESMXhIxZfXVvuunrT6rdmLjDIXI5qJQN+JO+OBP9dvqJmA+/rLTA9WeIB4A+cv3QoYxLKbKa9iI3D2jKlp1AxLXXwCgFz9c79lA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j52rRmOlTuMNjcvFLap+cT1rm23vaa2bKSGl63qLvBFCGaGiyPjx5CsixzWZb0H1qFsY4fPeEIysVeSAN3hq+EKAPwnYg6NYqFk4yV0lS+vb1i346Z+02ZhCZntluwKWDJ9dJolHokCS4z15G95ovpXBCPGtd5eHcQp9x8jk4gdM31I2j4BXQxcmM56QibJ8L3i+cMsdJI552uXbCUilD/X3GqeH8hkvk6G7gURtWwfTyOFt/HZ2lWRx+5SC2CTsw9nKANNyeXbIkJZrJGDATouP7qW3GnVG/yBTzwNqfcuMzuQGQp68SzVJSJmmwvogiZs9uJWYIGyegcp5hyGlXZAVnHgG2Em3oer4+IZhNjd1FYHcCN/qkVY853+m4/0oKiA/zjEZxq4USke+lMWdUdBPIz4HZOzkYvP2Dl7HDMao15zLl/rs5Nd/EEek/3gyjDR7NZ5HUldKeIS2wMFiEYRXcnRAHGlPO7WFqmWDXUmfwETjaa9n5TecNnBqOXku/vmbhofUhBH7UeEq1/bfgNkLz1dCC7KOqltM0kyxLy5d5/UvMpgAWX9yjaOym709gT6yjhyoCtTlL4uO0UyvdPXHTCInttRYC6yKLZJ5H71L73D0T3lb/Lu+AFQmFaM881mzlBOYsCKZsPpGYLL8xF5ur4ALh2hExv3AaXVvlH0eaCYaNmoHqBvrJ8OZjUIlYeyt6aPDZEoPgbTJOOp3tCTdeIZ9OUx0VDdTT9oAL+lrcOxWRymimyQ3uiyvWCzpJttyDYyDsUgmDcD3Ggf5MJErdXSRmz0aLua1WiPl66/oeVFLkrUgsL88Yz6kj/NptyDPrCDmzVGjmbo34CrJMxb91yB8axtOG4bLW8JXhedO0JgAVxnBXRsmo4EQ1V7HrwhzHzsXZlyimClryHvgjV9Xso3VJtbCz1dK/6KctNYaVfTVdIm109+st+KvqIWjYbAbM0NakF0GQuTW5Anmvw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85fd606f-c911-4a16-88f1-08d9ba88afe5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 20:24:08.1978 (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: AM6PR03MB3832 Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/movtextdec: Improve size check 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: lGMmmKV6ZTrK Content-Length: 1373 Signed-off-by: Andreas Rheinhardt --- The error checks here are btw a bit inconsistent: Most errors only lead to a break; in case of errors from parsing the boxes this just ends the box-parsing for-loop, not the outer while loop (and is therefore actually redundant, because for each type there is at most one corresponding Box entry for parsing). Yet this is different. libavcodec/movtextdec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 8dd571d64c..5083308d58 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -537,8 +537,8 @@ static int mov_text_decode_frame(AVCodecContext *avctx, m->size_var = 8; //size_var is equal to 8 or 16 depending on the size of box - if (tsmb_size == 0) { - av_log(avctx, AV_LOG_ERROR, "tsmb_size is 0\n"); + if (tsmb_size < m->size_var) { + av_log(avctx, AV_LOG_ERROR, "tsmb_size invalid\n"); return AVERROR_INVALIDDATA; } From patchwork Wed Dec 8 20:23:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32178 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp853855iog; Wed, 8 Dec 2021 12:24:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxHrjn4/O2LU5iafbsx56Qpq79BWxbpW63W62evWezTiSj0rOQdDoxu1GlI/6cXhpcWc0TF X-Received: by 2002:a17:906:478e:: with SMTP id cw14mr10097491ejc.46.1638995069867; Wed, 08 Dec 2021 12:24:29 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nd7si7539687ejc.515.2021.12.08.12.24.29; Wed, 08 Dec 2021 12:24:29 -0800 (PST) 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=BXTT2FB8; 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 2857168AAD7; Wed, 8 Dec 2021 22:24:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069030.outbound.protection.outlook.com [40.92.69.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDA5368A588 for ; Wed, 8 Dec 2021 22:24:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CLy0L3SvmQGg9oI7OmIopPem+nGBXRBoehUpeMhELyGsg2hlONL08w6STS7QvQAT5RduEKwZB2cwXLIQUYcvWy57x0veUEo5JLyDoIOa5dLOdsdC1CVWFyMEHNVqSHw9Qi/kq29+2l+t7Rjr92xC734DsT0vYmH5nc2QDnhoBfOVDueJ3glkUmE8Mp1X7hyShVh3jEuBoYYBLRu0vxBXN3INHs+Xkify/KVQxwnOQ/+wL5p6lxhJBkcM96P58hq4kixfc/Typ3cHDuZ/ERJPs50EUKcvegv9xvz15tBn4HYVX4qWxCPdJwKhsGDrXlWfFnJ9ELaOQhpZFLDlIub3nQ== 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=5+A7tyg/P/vokLKFKcmrveB9GPY5CFEq47Qrjd8jFTs=; b=RoCaQSKazNtisP2hdi50gjQ26Z+2ePlzaOzQ3Mr658kwfoThv20vNDTYBe+LpINLu2TPrKkyCrTu7DcsPWXYU5sAkizkiEDLkmUQ/LrdD2nVKEKWwx6Ot+x4s0b0ZeXEPvg+itBaDdav4Rxgns2a0I7bWyBmCzCBGtbWRH2AoDr0CzXreWi9adhRL2CRQeigTcQfksb3ABxpgsrDrBnqXUqQ+4X4P841lr1bB5WhZr8Rg+B8BdUSfVGiQjG3ouS/JRekeQfF9dI/QwwsjS8ILEdvuDrMa0fhDepGVzuBehDAu7WGP2xiSARgzDI84biE43iDSrlulbIE9GZqrWZlYA== 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=5+A7tyg/P/vokLKFKcmrveB9GPY5CFEq47Qrjd8jFTs=; b=BXTT2FB8bAHUuvB+GuBpls8OG23eton32RHms5U7K7ZsxGD9dwykqd5L4Ptr2Q+9XuyKcETPj3A/fJWM0fDGv9YaEgy5yNTtRvwLeMX4xi2I2OdjFDBtcuv+J2ZA5HF/5qce94czB+gK6S0olP1pa4RFU7jlmdXfxwGzxxu8x9B72JPTJtTvKen0TjD1VzvxnYVLClUm8IM+dN7cLeZYmad/d59/+q0o3YesuIb4ivo/UKUCqdFX4nohTL3nIdQK/UeP8TjCKVBhuVdTlx/sfkJsFivPIWWOoYY880HV6blrZ70OayyH9Zy4lN9u0NxA1iCB+obrbuGiwoqPQ8emPA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3832.eurprd03.prod.outlook.com (2603:10a6:20b:18::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 20:24:14 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.024; Wed, 8 Dec 2021 20:24:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Dec 2021 21:23:56 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [YEO5HZAgOFAykkflX80m+FMHV+Jig88w] X-ClientProxiedBy: AM0PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:208:fa::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211208202359.593906-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:208:fa::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20 via Frontend Transport; Wed, 8 Dec 2021 20:24:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 176fba35-53ec-427c-ecfc-08d9ba88b398 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUJNPNrsFw39+IRsSLFO7mfxvLqFypTCdCdBDdvr09PiRweXBAVDs8dnrGNSdU2ekqosmLfmwSkySK5Kw+Pj7uZrvOjWi3f3/XzFSVy2LVAT68qRR9pOb7xJbBdZ3FeHlYLFKVGHPp9gIEe1XbktiLQNmC5oRMJbaM3WWBGMXep+aQ74PsKN32p1zYoG9L11TsKN6m/xEJIuZ77v3wtFmR+8D3xb3EJ5qoHFzsIEkqPEdICqfeeg9fN6+MxJ7cZtmkOk6Q/IVs1nUVu8iWMksrLrGpmxFY13cUpYGW5LlKZhtS0fq4hmyf/sEPFhqrtCU7LG9g8to12BqLxKT7ZQbs7ZLlbtiPupQ48fo6UptuMYXTy/V8T+/ujr/0ogsABlpXtc8QegnxiZddVzFS8rvzGx+m+mTICHPAxm7HbTf+ZimRYkre77oOKFGp3557Jb4mdPjFrE9D/oWcKjp7/cylysPF4uI01TiwzxWNh83DBQh2GCUImYAI0h3psCkaFrR6VRoEwAEsHCr/GIczbxYf4D9NqqWuKlo7HRXu4SzcLC0nJJ61uiOCNZjtOICE0t7LDfEM/T4NhXrIrF0kpei8B0quY7HYb1n7kSLH8MF/QsznL0VoSxkxwVazflt2SziVB3sy/KhQGR9SrUDJY/ravAOxNkGK/InkI3BvEHXubEYRlEUeh+fYcqcWZqy0QH+MXuxp06alJMyeJ7G6CaX+R3uCLXIxU8BQ= X-MS-TrafficTypeDiagnostic: AM6PR03MB3832:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nzbORziKt24TGX3XN26tkFSdVB0l8kGq5sNg2Fa2VU3jMNHjUOKEgCqORnpdhMFVTt3zkX0LNas+xrPZInlopfU3U2Zqpf7/s/RWB17Lm8x4kw7pINT5VeHC/siWQpHG6A2g62f3icA+7pMZpHicZ2OOhFCSfRqGXCOhPKwoyMbLVeqmc0dEmqI1TW+LjJKsg7n3BpruO6TAIeq2YloecnUY5BUzjIew92OE+86q/+ROD2XhL/hRMqH5qsoqTPH+F4zb8qv6uXJEKH61UnmHRTjq2NV+7jIRjzqNRSv+evOmexJ8ZJD6u/nIBvX3VthrStSipsL8Ps/jpASQGonjObVbJ8B5OCWT04GAqSH+TzTlHvf24XOUWIKs/m8pQAMsZkReiJCFWUyozrNDb2PxmhPv55ROeoxsXV0WiLOo3F7YR0Skw0GYsbGEY3TpiKQXu3g3FyxBjH75YolCTEA/sJaRr7ENa11rsBBC87grBzoQn7Sjn4qXFGARTkUqKLFdXaVoKcTFRkFqfjQE7V57dLmtJuL4BOY7uFsZ68hx0NqVSgVI5m18MaQi8z35dMZQ/YQtSMBuZGoYTRQiKlnGSg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3B/KtRS63uhOfvgp3NQ44OmZxU2pp6X13zCzMfsnOraLrc2QJGa3WXbvLrT4z5b4yPjt/Gs3qrqs+x4VOu5OPLwue613LmTUiIijQI6GQMrJEfqzVittyik8VIoXdxys5BgE4z18FWruXg3RhTaDqf7hzsBrlAfDZFxwFFddb1+YUPBUEpHp9Vaazp+qGBRMK7NwbTjYD9V8063I/vxbLpwiaYB8DJ51WM/NBEPoNzPVqXMV7/HBYQpY5yUkpZLbxCZTroSNCBk0rogBE3Q3+HZ6ndftT+sHMCmDTWNckf1fzYRqyMGnNceN+nwbzuzx7d9WHNJVQtslTPkHby9Mj6BlsBg12WO2QzW+xFdStzBWyiwqPmOl2yHKuErM54mQi5cQIyT95GLmm2Pb9MpNjwgKpP8qG9xJd5/85Qbvhcyx/y1plzxnNPtUl2kwbYcS34UJDLIb2l1GeWtbtdOZ4li+GaYjCOFgB9v7xfXx07WeZhGLMSevQX5CFg+RSj9mZ7XgiOlD7YRDMzkpj+D/mM5+/2Rhb1NRdQ6DdUkQSPEu+ms9raCVpXgHtZIylXKKB2WL7eKtBqaaWrC3acBD1JCfCI4tOF5bH0cFoaUCXZUsrwHuf6Q8evnjN01zarn7phfYw0GXv1TTG/lbCwo+y4j9xe03oYGGuIprWNswDCsjY2XXJ6sWBRlYMqHHMc9RCprFF76030PsOOlnA/BXVrZWzQZs1eo7YbZRW3rlxoesjeYRxZAjlrNcjdsEGVePtc4MfvTRuwntPkyu8aA8kmAHbWuhIqR6yYjQ0ziIjQVU7s8AGFor7JhPY8o+OwnEa9GE7dGA4vifY4iN5bPYemJAbr/xiMSsvj2z9fDEff3EHFUGijIzExLxprSi57o8O3wmgT1h9hI2ZDGg+XAu+yVQavPBYCYzHirh+De18ONL09Qgx6VnLb/KlM05fo9YQegdszRYv7k+ARFkuobwwA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 176fba35-53ec-427c-ecfc-08d9ba88b398 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 20:24:14.3273 (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: AM6PR03MB3832 Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/movtextdec: Use const where appropriate 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: XB4F2hRmIeS0 Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 5083308d58..001df6a5a1 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -481,8 +481,7 @@ static int mov_text_decode_frame(AVCodecContext *avctx, MovTextContext *m = avctx->priv_data; int ret; AVBPrint buf; - char *ptr = avpkt->data; - char *end; + const char *ptr = avpkt->data, *end; int text_length, tsmb_type, ret_tsmb; uint64_t tsmb_size; const uint8_t *tsmb; From patchwork Wed Dec 8 20:23:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32189 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:cdc3:0:0:0:0:0 with SMTP id a3csp980909qvn; Wed, 8 Dec 2021 12:24:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJwPMdPfCPACNv4otV3H6ywcyX7Z/aKXwl4qLv0aEFkOHvR2oeJnbpkI/d6fF6txgod3ncth X-Received: by 2002:a17:906:58c8:: with SMTP id e8mr10213212ejs.444.1638995080113; Wed, 08 Dec 2021 12:24:40 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x72si5577186ede.97.2021.12.08.12.24.39; Wed, 08 Dec 2021 12:24:40 -0800 (PST) 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=EMFQE8nq; 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 7C78268AB87; Wed, 8 Dec 2021 22:24:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069030.outbound.protection.outlook.com [40.92.69.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAD7668057C for ; Wed, 8 Dec 2021 22:24:19 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zpxl0Xa2ApoFOEhqQbZ6seRueACZdkrz65od6Rl8wAqYF5H2fe7xMd0AfTCJi5AA1R6fZ6g5L5DrBoxlbnR7x/5wL5qCZQLcHzGj/LU3GiacQDCW4v0Ky+dpleDKq3S+2TM6S5guRjOHpNZEPapOwrIHRDwLVlc7t69M5wvJ1KOgXfAAN7CQPa9zyaM06RkyBGNIWyA6ee5Yhb78AybN0yZQSbrYqYx/2ebGgz3CenztGVMbm+E+mWwe4MbmJdq2PZ4MREHph/s9sXyeve+7oKu47T9y+WtV995G4elv9r5RTyN4EukpKOVSw6mLhlWRIieackcSYAc7uXxcrKoXNQ== 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=1gy6EwHuy+JNJuAMZce+PBLthICy/oS7hEhyq01zocA=; b=V0fbhDjzk4WrUDFY2ffmfkTq917EP5N0VokKYVbwznEcf9t/MAJOSmri6zsEqeP0fRQOTXIpD3270z5LLWoFH67/6NLh9LhVLhYb2RHFrYtDfrwfFLdkdafAIFeJ5xaWpceen62Y9gfzeFvNBFGnpvEyjXNS9GwhrwUU0nXoyVQ2ypGo74cWf5GmHhaCFNz1aHHhhj2wyDklt0zLPsI8Kwl5ioDO2HVfG9lbB16mEmzDB9nis6bzkoawFGudQ6fX82UN6UKDX/a0i5/awvbPwAB//c1hIjhGlgYG8Qogc4msR/sgtmw+uU103tzfO3XY5ynq+M+Lpt7bD4zS+YzL4Q== 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=1gy6EwHuy+JNJuAMZce+PBLthICy/oS7hEhyq01zocA=; b=EMFQE8nqTGIyNJpqnrZoqLZGHFrDIaswsD71T+PwQ6L0eqha7r0DSRiEg4cFOqIIXem0uiaPMSOckY+tEfte4dQYxn508uW1FkaXFbeH7Z7ODbO3JDy18NOYOAdZK+QFQRk6XbBjHOcvgK7HjTwNEDjQymjfHh9ilWWNKKBmhVNrwnpYif5hdJyKgWrNRSQDcuocOfJBNQn8Q7PZlBrDAVt4VTScYDrfM83biiZGL/CMbECQLh5UmgIXeH5/K5mNxhxIEKr1dZ78QNT+ZmRslg9oEx8Sism+uz7iAlJWOPeXrWqQvNnCDSmApEQA5twf6TEHNv6qXTIP8SWSHj+0ew== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3832.eurprd03.prod.outlook.com (2603:10a6:20b:18::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 20:24:18 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.024; Wed, 8 Dec 2021 20:24:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Dec 2021 21:23:57 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [TFROh8/Wy3jwZDwZgEbicSfMUY2WS5T9] X-ClientProxiedBy: AM0PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:208:fa::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211208202359.593906-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:208:fa::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20 via Frontend Transport; Wed, 8 Dec 2021 20:24:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ed6e0cc5-6176-42ec-bfa0-08d9ba88b5fd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQfCRqGW160PNMDf7lY4pH4lNrE50UcwXRKYvHG59y1IGz4oTa3Q4PSeRLAaD0Y+J28xoSIp497r6sLcV0andOWo3w8gO5tYYYbguwBKNV17FYsmXPyKsySj2j4Ak52JMO92jMCJ+St3BmEMtxjnKaLc5JxpXTUFeKLjbOzU8VXxU/MsnXyu69LMnTyj0i7CRt0YntiYKm26UfHusHLUu0/rg9WvOluiJ2QX0PzBp4mmV4Zu9DS5YgW+C/MrylZIp1de80I6i4kqXY6LtGYpE9lfNowIZ5nAQPfOCrUCP3IahiYgpFksEudhSu/4SmK+ch+CmSVuG1k+20cORYJ6vU1XsZ6oOAdru/cAPVK0DqexVPqgA7sjGAvyO6MMsYQRCgRAp+WZkvRxeU52cb0ZW/tlRgpOAAsILQ7Ec1NY9t8kulsVxPYsUeJ5yFoHsGeWS0WVDApFd2/XyEsqPQeygIkpr5+7rVKTPpwcRFq4qJLAbyRyDdiJPZrW/blBjRc9q5gWP6l9ua2E9IQ5LLcJt/fw9VQK1LOfoPP/Ohqt7qelWu3REJ8Kkna3xLWAgTaBas48lGf1Y17e1whj53IpryuBX7AGbf/MGDDLlWlXeqUHIrLWOLTsCcCJw35Q7lIpGDaRk4sOpjzqz6Px6y03tfWVaK9XCUGgVxOJwb2PWbTskL3kvuSw+sJ8WonHoPFVoDLCGs0twAm1BJzeq+R8rPDwefPNMJ0IpV1NYelnD4axP5JWRNzzi4KtkhI8t1gRa8= X-MS-TrafficTypeDiagnostic: AM6PR03MB3832:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /AY5PpDOQzg84J1jhR72xjgaPlM01XQU0yJpu2jdgwG3VEhKJb3EIZlo2vo46/ZA/aBvDIl0zvn8AMSjiH07FYhSUzFw9n9E1O9WYwdHrMtcw2SIHkfQzdymLTd+P1nUdY7OZ/8xdjW0kyQwxnszoMLZVC/k8CKLafsLjrUAaS0Kt3el4W6RIEI2pUfIi43S3LCUOcNX6ZPlb0/4VVA64JUZnOBjUojqnUVIgZ9ekUhEL80xaq/CjmTyo/7WpyaXxsfP+0sl+LtpLQeghyTve62oLQjCOZGuER83MsZgqU6DqqPk9GybSKtmo3t9R/DQh7t8YblKfnm3qNMp64nkcYq44K93qAO7ypqTdekaYjadZ76z1qSur/uF8rsLTGLr/IZtnMsVtgI9DDj14HQUJU3f0g2EOH+JpxbQOfyM/OutfeZzLO5DEhHEHh3Bl58n4mPRXXiHbzYQ2QZOQUZM8ymilxRDY4wwQcOfWA0HANB3COKq1zZBcSodf6zPgZtRm1p27lKptYHnYCD9X6O85o9T/h3PSvObk1QOYAGspOhosri+jnoP+20/564njY4fc6LEYe9XmrBfOEUQ3Kyz2A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: B82YKfhC0ZTCHtwPVisC7owi8WvZWA4a9LbIRpeGKFqkfLbe/9K31lQJ3qWg7Zi9amvvxsyQu8QGu3cX31Zzp7z5DLKw34XRlS63IZ9wjxh3H6F2KeK1fBwNrbux3cjgoQ/+zWlnwTnlgrBuUxffUQ/2p+5VfqSELwWM+qKcpa/Z6lOydwBL02STi37DFf8PPAK7XiXyDBSX2+WvC8M4bHTf9u6Z8BKhLBic8oh5Tgu2BNZbhS7guIQ5ieSiFk4yy0Ok+aDtjDRVNJibemFHDumDWEyNZx3QlAOHVTaQHxyqaS6/tf07Y812NWx7TU0SUheqYprW3o9YtgeFE465f2O44BYJqpVmsMRxG0RFACaF0xkk4LXk9gVU17eXNj/c33SlOWAid8eC76yDoAKKYhNOH4IbsacT0Mx6YXMRe419Skd4K4JRa3V2hVrN+vhkcvf/Hv8jjHkJEd0WvsnO9zf6ISA3I5sSrB4eixCnF7YTSfELKc8hBeB/Ob3rAC9nv7ZHExkSpeUb+yBGO7v5AEO1+s2t6GfRtaKQxxcXjsiFFQVpopw5LWaUxHFhO7NZKiSmDlaYKARC2ASOC+tRFDf0px8IP4oOTGW8jJyBUKFoezl7WcbXhl/WI0tE567fcCYNa1rmPNFqvXnW+f3kKxHmLEjSLuam7WP0aX0hjI9GfO8/0GptOEuP6ARfDLq8hUbDXioLWxBvq3/yDgDQ8tqfXI8AbSW977D3pQhFw5qb6kBQCp/7hRB0hAFfNxyPCWH/356Vl07wvQ6eH0Oa0iLoQ2i1IAF/cAqYF9poGQgi7Hrv5RFmfJlSbRpcFuiQHljUjCWoWai2i3Wp0YrJ4w1zdBQfnFPbDT9iCObi3b+F/LIXBMIIRJ/qYXuIVzTqDONnNqyYBNNNgldzELZsTuZOBmdH0Oklid1rgk1oedhRkjSuOfmMCI9x68b2XJdqjZh51n8nYm6dFtB16XWn2A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ed6e0cc5-6176-42ec-bfa0-08d9ba88b5fd X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 20:24:18.3134 (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: AM6PR03MB3832 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/movtextdec: Redo TextSampleModifierBox size checks 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: 8EY8TD2aLpFP Content-Length: 5065 The current checks just check whether the boxes fit into the remaining size of the packet instead of whether they actually fit into the box size. This has been changed; part of this change is to pass the size of the box (minus the box header) as parameter instead of a pointer to the AVPacket by which the box parsing function is supposed to recalculate whether enough data is available. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextdec.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 001df6a5a1..967c0adf7f 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -103,7 +103,6 @@ typedef struct { uint8_t box_flags; uint16_t style_entries, ftab_entries; uint64_t tracksize; - int size_var; int readorder; int frame_width; int frame_height; @@ -112,7 +111,7 @@ typedef struct { typedef struct { uint32_t type; unsigned base_size; - int (*decode)(const uint8_t *tsmb, MovTextContext *m, const AVPacket *avpkt); + int (*decode)(const uint8_t *tsmb, MovTextContext *m, uint64_t size); } Box; static void mov_text_cleanup(MovTextContext *m) @@ -241,14 +240,14 @@ static int mov_text_tx3g(AVCodecContext *avctx, MovTextContext *m) return 0; } -static int decode_twrp(const uint8_t *tsmb, MovTextContext *m, const AVPacket *avpkt) +static int decode_twrp(const uint8_t *tsmb, MovTextContext *m, uint64_t size) { m->box_flags |= TWRP_BOX; m->w.wrap_flag = bytestream_get_byte(&tsmb); return 0; } -static int decode_hlit(const uint8_t *tsmb, MovTextContext *m, const AVPacket *avpkt) +static int decode_hlit(const uint8_t *tsmb, MovTextContext *m, uint64_t size) { m->box_flags |= HLIT_BOX; m->h.hlit_start = bytestream_get_be16(&tsmb); @@ -256,7 +255,7 @@ static int decode_hlit(const uint8_t *tsmb, MovTextContext *m, const AVPacket *a return 0; } -static int decode_hclr(const uint8_t *tsmb, MovTextContext *m, const AVPacket *avpkt) +static int decode_hclr(const uint8_t *tsmb, MovTextContext *m, uint64_t size) { m->box_flags |= HCLR_BOX; bytestream_get_buffer(&tsmb, m->c.hlit_color, 4); @@ -271,14 +270,14 @@ static int styles_equivalent(const StyleBox *a, const StyleBox *b) #undef CMP } -static int decode_styl(const uint8_t *tsmb, MovTextContext *m, const AVPacket *avpkt) +static int decode_styl(const uint8_t *tsmb, MovTextContext *m, uint64_t size) { int i; int style_entries = bytestream_get_be16(&tsmb); StyleBox *tmp; // A single style record is of length 12 bytes. - if (m->tracksize + m->size_var + 2 + style_entries * 12 > avpkt->size) + if (2 + style_entries * 12 > size) return -1; tmp = av_realloc_array(m->s, style_entries, sizeof(*m->s)); @@ -519,6 +518,7 @@ static int mov_text_decode_frame(AVCodecContext *avctx, av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); if (text_length + 2 != avpkt->size) { while (m->tracksize + 8 <= avpkt->size) { + int size_var; // A box is a minimum of 8 bytes. tsmb = ptr + m->tracksize - 2; tsmb_size = AV_RB32(tsmb); @@ -531,12 +531,12 @@ static int mov_text_decode_frame(AVCodecContext *avctx, break; tsmb_size = AV_RB64(tsmb); tsmb += 8; - m->size_var = 16; + size_var = 16; } else - m->size_var = 8; + size_var = 8; //size_var is equal to 8 or 16 depending on the size of box - if (tsmb_size < m->size_var) { + if (tsmb_size < size_var) { av_log(avctx, AV_LOG_ERROR, "tsmb_size invalid\n"); return AVERROR_INVALIDDATA; } @@ -544,16 +544,18 @@ static int mov_text_decode_frame(AVCodecContext *avctx, if (tsmb_size > avpkt->size - m->tracksize) break; + m->tracksize += tsmb_size; + tsmb_size -= size_var; + for (i = 0; i < box_count; i++) { if (tsmb_type == box_types[i].type) { - if (m->tracksize + m->size_var + box_types[i].base_size > avpkt->size) + if (tsmb_size < box_types[i].base_size) break; - ret_tsmb = box_types[i].decode(tsmb, m, avpkt); + ret_tsmb = box_types[i].decode(tsmb, m, tsmb_size); if (ret_tsmb == -1) break; } } - m->tracksize = m->tracksize + tsmb_size; } text_to_ass(&buf, ptr, end, avctx); mov_text_cleanup(m); From patchwork Wed Dec 8 20:23:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32179 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp854218iog; Wed, 8 Dec 2021 12:24:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1NA4/cv5v7sODGLNoXaAGUZN4WZKSu61J0ma3NIlL4iMpBFMxSHxI0Doek/8g4lrocLg6 X-Received: by 2002:a05:6402:168a:: with SMTP id a10mr22161487edv.219.1638995090949; Wed, 08 Dec 2021 12:24:50 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x20si6302868edd.541.2021.12.08.12.24.49; Wed, 08 Dec 2021 12:24:50 -0800 (PST) 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=l0rSIvCq; 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 4C5C668057C; Wed, 8 Dec 2021 22:24:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069030.outbound.protection.outlook.com [40.92.69.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 166F668057C for ; Wed, 8 Dec 2021 22:24:25 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h1SQ9ZyJWeNBjP9nbbaWvqNz6S2Q3X9/9TwE5LY0ASqPT4mpTiZkQL4/jVQTVLdrgnMd6rpA22ly6QINBpzlAeoaLCwY+QUp3n/qct5prTcUDuH/VFTtTAdfCIXpAMHZh0bZPA83DUQINWFXiQZqofHioKxXHU4PrJUVWI3O9iX4zAwVu4uc5vd6K6NmpMhHWlyl7m9j/jaJdrVdSAn0cYOI0/iDFVxk1zTOGPP6IxLHJkdmDco3/MPcNp7qLDXukaBL0/lAO8HSS9zCM4ucmgP2UXZszZOIux55CfDxrEvKok9qsU1+Z8SCizeOubISEK9ZBAGLT3xyex1GRmr9qw== 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=rUoiPqF7Kkyf202M13aehyoGIMnLtsFsVqX1eM8xj5U=; b=ld0oB6LcMKoS87GKOJ/BmKhs0enoI7+3qOZk8ytge4A1KP3+h/qIP0Ob+NGjh7NePdAy9ifgZg/H1/KsuTE/4opeemFPGMl9tH0uTcK+xBHlEjNef6a29Cwv0eJDQtqDKfguI7dNrRmUPGG11TuIiSavSqoz7qpC+xWO75fgfMTj4y5+G0QfEPchR6/RrzCigqYSyr1AOishtLwlr9NqYfpKmtEWkDK9A0MmUFFJZ3K75Iq/Uc22cTtKSzbxDw3a8qv27vBi+Z1M83V4FfH2E+7k51ARWe8CQ7j3y7ysTMeGTyEbJoVnvIDukcGHqgn4GMbttp0vuCk0pkc8iaG/Hg== 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=rUoiPqF7Kkyf202M13aehyoGIMnLtsFsVqX1eM8xj5U=; b=l0rSIvCqpoNtKXrwK9TrRFi4oh0bukDzTthIU7iUjY/VatP55t7Ujb4pS+vKt5rdX45BpwDcrZbcA6373PEvHN+dm7kL1+rO7n6o7QN3ztR90JMhk8wE6sVyHsuhiHn0XyA5wQ6kToQJsQz943jt8LSHMyoE6/+BxFUvlOSfS3gvhbIDlrrU3VPv7YJBtdlL5at3D7yZLFgxSMCL/JsmojxY5EdEqU9Ik/uRDlQ74TYU7y75kMjP1zVkPt4ZSKniekHZw0nqE93VpsB3p1KvfToTtFYQWBncprC2QOo2LCM4APkbPq9UYe7vA0buHJEATKKPmm09yewa7kv6p9BoEg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3832.eurprd03.prod.outlook.com (2603:10a6:20b:18::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 20:24:19 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.024; Wed, 8 Dec 2021 20:24:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Dec 2021 21:23:58 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [XlSZU4LGbbt5l/RPxksrgcypD0Bwo2Px] X-ClientProxiedBy: AM0PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:208:fa::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211208202359.593906-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:208:fa::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20 via Frontend Transport; Wed, 8 Dec 2021 20:24:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 409b61ec-91b6-4f1c-2d16-08d9ba88b6d9 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUJNPNrsFw39+IRsSLFO7mf5dHzA4wUhKkNvgRBJyUCnb7e0PPkg+Ag6BSl3XOwLod/mYCLMhiYPTuPO+n0clU5LIfIrZbgB6yCIS5lusylkb4j6d/uIEBChRsMD1/qyGskWW8kEpG2rGTtxlT4j2cuIdomrqelMK/1+SkVPcILsvnsjbaKNLWVPhMBwts514bF62tXnYTSfGwd5X2B2VObWB2j66EmJj7sYdz/Ddnbh0hnisZyYw6qlF6FgkoZOeXHzvNNzns1PGvGxvFL2SyHT1Vf9BC8Ah4c8K4N+6IdSJsqE4T2SMUQYVjVvYAN1hRTpQAYfUb+aJEmXYOeQF1Okn+MZY+txCaLR2uVmkJ/+Fzk/SzXkhX6ha0ileF782kReInu11NVJ//XsPJrw86WhVyN/3jPJlyfLz8JSf6u1+K6230usUa9AGu2yDVqKvUSDPNclUZHWzrpFhzVxWIL0jh1dGCBPrMd5nI9hBt+coZ9hM0wqp/dAeut3N7xlCdSjW+L525LM/v8JP2mGqClTYST/A6Ar3ftDxcRr0Lp5dG6056SiQOFkCBp1mRinWAJ7GeZYS1AwxTF6tbyyqNMVRH62e+Mrwlkgba4dbflxiC8hpj0lwAJ+3Zeh1gXcOE97lyazsTgVvuGnvlVNOqwKfrd667aY/KlsggBhJEVvivZPbF6RafE/czo6EpJyzGKeVnBqZZ8hFtWF/CHlo9CV6cvIThUt6w= X-MS-TrafficTypeDiagnostic: AM6PR03MB3832:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qepbZmYyXgfybSJsDdcZbaykTp6fVqqkjZjcY34Ppfn0pe+HpEOdkV/R9XuEm9gfNxl0EwxqdQEumEEGhdH/SVQfGs7uTUzlasljRurqr8qDJyDOM02VVnDBev3b4YVkKVVqvR5W7QPMLu9r3KbPBKZPytkkQXwIFAmLOEvAX6q2wBf9fGVPzIGDv92CyVKF6mFHxBL+2RVOutDWa+vpvgsOJiVDoRu/AGUMO0FTZrJj0soKp3c01M5fTjoiUnKs6tVRO7D1ci7uOkjucNkEwj3LyK6GQYj66YXG0KWaGsiYhMxg2qMiXG3cKrzP04L+Rj8FVTEGRKLwvjjSs5ak4u8QLpP7icLyMb29VziURhySntVPTD8LP8RDvvlPd05z6XIGAobxQ+r/x1slhETiddu3Wfv82PFxAtLQ7/mE3PgmWflNpBiY50zfyO0OMZp8N+b8Nlp+88+qP2onIOm+IQgnKt/lMx6vMVr9Oxl/cY7MXFIe0sotm/hyDYjx6wBWvG8V1Vr2fkw13ddn10rA7Ic1kaDK2IdLJW+otUNUnt3WCmkVzB62Y2mz5a0ni09/IVILAcnPKkyZ/qvXaKXAJw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /uQ+okdfDomFxfg20NrE0fUCtDMKSesOlrOwln+1lgVGIDuCRGJFOFI9LiDJJlBcNcNUAWSWKAPSaeegG03NZfUAz3XJkz6EHsNS2Lx0aShs39cb2Zw4xHUxVixmM5xPY1vgFxw41aYFY6TvCKVGUn7eVayVi+aTrT+HCNfXzsCxh9GN6cq1AEda3xP6/sbLX5vER/kvkLR9CARN+GHZ8eeLPXt8dYaF2O2FhPfshCcvo7sCawBlzTjwlSWiqmCFvw/IUjCWnPlZq/bqXWuKWOstWAlS0CQXZDjscNaX8t5zUqqkzh8qOzE1j8l+MRZcn5zTlokBRdBT0xs6Q6l1ojcEWOGlJkNu7qWA0eonJck/mSvtzoArZH2VMatyHPhCKqautjGkWcx6sAsZ1iXz7asjy/Q0hUSjYOAEV8cCzxDAQ9b4oPUbc7+k0zSsOkj0JMOX9zHCPvpf75kcWNRQqG04qxZfL61s+CqIBgq7cExKGUTFA6W6oMy/6tWG/TPlgrKe2bvF66Y4LlnAZzcO0BalIPSx2qKAN2onklMLbdoY6PflCvOfjWMj3ydC6jwwoxwWVUKC0fVZf4gMSHp2NuGDqqz9KQHT5rPJ4m/1WH4vI5l6BSOn9FjI8MLnmE0DTa54wP/C8JsYFwhW9DsTAFasaVkT65Jj4bo6qjJUXxrNXvL+t1HuzgIGntTOnl7yKNGxI3VA+LKz/4wDmjKN+gk6LjdBr65ZlcIUcevQ10TFk/b3fdXvEjNr6uy3r3olPmKwGGLgmiouTeu38W7kAFQTBZCGrww1iJ4/WLqjQk9XkLUneT1xTLK8m14fOCcuaxwyfAipUVTJoKpPwIabmg8CwJD4TzSHpkgyzb3tcWNAtCgUPSs5pL9jB1oi+I+Cx4aLs3YaV8sAIjZ78f6EGJ5pbH0z0xGEcDbyAR2ckjpbiyhHa+FJPLEwuVgF94R+gc8BsHXj5195oboFRZC8sw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 409b61ec-91b6-4f1c-2d16-08d9ba88b6d9 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 20:24:19.8296 (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: AM6PR03MB3832 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/movtextdec: Switch to pointer comparisons and bytestream API 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: Wrk7QrWretNQ Improves readability and avoids a redundant index variable that was mistakenly called "tracksize". Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextdec.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 967c0adf7f..63709eb54b 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -102,7 +102,6 @@ typedef struct { MovTextDefault d; uint8_t box_flags; uint16_t style_entries, ftab_entries; - uint64_t tracksize; int readorder; int frame_width; int frame_height; @@ -481,9 +480,7 @@ static int mov_text_decode_frame(AVCodecContext *avctx, int ret; AVBPrint buf; const char *ptr = avpkt->data, *end; - int text_length, tsmb_type, ret_tsmb; - uint64_t tsmb_size; - const uint8_t *tsmb; + int text_length; size_t i; if (!ptr || avpkt->size < 2) @@ -510,27 +507,23 @@ static int mov_text_decode_frame(AVCodecContext *avctx, mov_text_cleanup(m); - tsmb_size = 0; - m->tracksize = 2 + text_length; m->style_entries = 0; m->box_flags = 0; // Note that the spec recommends lines be no longer than 2048 characters. av_bprint_init(&buf, 0, AV_BPRINT_SIZE_UNLIMITED); - if (text_length + 2 != avpkt->size) { - while (m->tracksize + 8 <= avpkt->size) { - int size_var; - // A box is a minimum of 8 bytes. - tsmb = ptr + m->tracksize - 2; - tsmb_size = AV_RB32(tsmb); - tsmb += 4; - tsmb_type = AV_RB32(tsmb); - tsmb += 4; + if (text_length + 2 < avpkt->size) { + const uint8_t *tsmb = end; + const uint8_t *const tsmb_end = avpkt->data + avpkt->size; + // A box is a minimum of 8 bytes. + while (tsmb_end - tsmb >= 8) { + uint64_t tsmb_size = bytestream_get_be32(&tsmb); + uint32_t tsmb_type = bytestream_get_be32(&tsmb); + int size_var, ret_tsmb; if (tsmb_size == 1) { - if (m->tracksize + 16 > avpkt->size) + if (tsmb_end - tsmb < 8) break; - tsmb_size = AV_RB64(tsmb); - tsmb += 8; + tsmb_size = bytestream_get_be64(&tsmb); size_var = 16; } else size_var = 8; @@ -540,13 +533,11 @@ static int mov_text_decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "tsmb_size invalid\n"); return AVERROR_INVALIDDATA; } + tsmb_size -= size_var; - if (tsmb_size > avpkt->size - m->tracksize) + if (tsmb_end - tsmb < tsmb_size) break; - m->tracksize += tsmb_size; - tsmb_size -= size_var; - for (i = 0; i < box_count; i++) { if (tsmb_type == box_types[i].type) { if (tsmb_size < box_types[i].base_size) @@ -556,6 +547,7 @@ static int mov_text_decode_frame(AVCodecContext *avctx, break; } } + tsmb += tsmb_size; } text_to_ass(&buf, ptr, end, avctx); mov_text_cleanup(m); From patchwork Wed Dec 8 20:23:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32177 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp854418iog; Wed, 8 Dec 2021 12:25:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzVaApXnnJyfoFMWu5yy/DiR6VmAdn6HgKu0VVt6W3FsbzWxu9XNXCLHTcEoqrLH33RcvlL X-Received: by 2002:a17:907:3f07:: with SMTP id hq7mr10060759ejc.420.1638995101815; Wed, 08 Dec 2021 12:25:01 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id nd5si8432872ejc.103.2021.12.08.12.25.01; Wed, 08 Dec 2021 12:25:01 -0800 (PST) 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=mipNm+q5; 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 583D468AC75; Wed, 8 Dec 2021 22:24:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069030.outbound.protection.outlook.com [40.92.69.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 33B5968AB42 for ; Wed, 8 Dec 2021 22:24:30 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aXguVs2YGB+wWoUeMbb/iaw3V/9wrLfy5sYO2U/6KgtYLcvSS2PrqDoJWyQAx+0ZiksqQaIjKDQskJ4BetQ7R8fArqy+gYbP/dGdNsIGDzW6FMREMMhG7rUwT2ntbULQO9xmCZNf9zxza2AgYqgn0/fentWVw2GjhJ3U/BthjJifmmhRgYl32yTHPZ/bP/feIEEzCT5jUH/sBPN3L9UC1/GojZQKpF2HTa7GYSb4VzoMzATg6F0lpAzvCpuYmlfzmBbXMAMAoed4YKbXHhnwmyoGLZYgR81zQ8vx1P1qWHWpfqCm+QO/2DGNcpGTzU+wnhl6nKKWSugwQMJbgRHVOQ== 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=a7b1YnQTaNFHO5pOv0ljNyuaPq+CE1DJ81IU9dr6MDo=; b=WJ0UUICqOg8szHA9Lfe64GFd1DFOsEBY59XOHNv7qCFiJKN9G/nO/Hg7yHTvwoXtjKrdrwAtBxjm/2l58fUSVqe5Qxygwt6xcvZBNjzyF1OsyyQrdZfKQwByRGsHyJvV3htst2ukP414I9mFqWDsFbQ76zJr2C7WHBDPUmXwW6G73dvtrifAOEDPWOfM+tEmHS/uZcwJyK27QFqqaHUm2Fo2XtQhujhJdQMga2chMci7rJBlPKiasOiV24hmzz5olXJXoB1AfeE13u2px0nLaLi49H74IefrHQ8/A9o4JWbVd53eNJW71BZTqVNYwpWOONmkPK2y0vldc+6YLHOmnw== 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=a7b1YnQTaNFHO5pOv0ljNyuaPq+CE1DJ81IU9dr6MDo=; b=mipNm+q5T7n1MieTooiUD+EqEwyYRFCLekh75UYkHBsQhuo2ZJlhMRiD4f8tz3j52Q64Mjgmg55/wPBHTZycqiu4Dyq/ozyXtuHWyJl8qUre3T1q0PKc+SSIyqKJOXRwQr8cwEi6fZNqEGRXD462YnxTtzoN1yY2PpL++wg+h5klXIo8XX0KgaW/+EFxE8hXAltqlJnyhkRZcpqFO6tHd7YIoeK61o/c1Dx4qpOxQcYZ6GxKxaeY51HK95rIKuZekHv3o3nvAbald9nEJsHd8+Uueam5t89Flja+2JQngxHrfNibhJO7TqqeRB45l7pypF6oUKjY86nug2vnFB+ZTA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3832.eurprd03.prod.outlook.com (2603:10a6:20b:18::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 8 Dec 2021 20:24:21 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.024; Wed, 8 Dec 2021 20:24:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Dec 2021 21:23:59 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [IEbN+DHiHUvTnnGh2aQ/iiEgFBXx9MZ2] X-ClientProxiedBy: AM0PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:208:fa::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211208202359.593906-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:208:fa::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20 via Frontend Transport; Wed, 8 Dec 2021 20:24:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 46e1a6a8-2843-403b-ae61-08d9ba88b795 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKnymDxuRLrjurn4gviSgT/lfHdKnbjg+0tCltNLrOeBuKYfcMs9gIucwhx+T0gZZOx5S6MHzIGBGh3wRKAO2ksOLfCwcLQ1XnU1WGs0SoUKJ3+MVdTWtW40qrMZqybHIbRmumUHQ2tSOBR+c6pACDiQINU40USyMv9Hj4mScSpy27PH3KfNv7ey0d9gXy4XFIWlZapjE9B9NsFpacCsEtV9thrn4XyGHuFnmRuHAsMK5xXJaVUDU0G6dTEu4MgXG8NQdvninqZtVaw9uijq3G1vUuuvmDhaCtO4YDiP4bFOM2Hnii5KcBvqGhd84um5SUgbG+OxZAww71hvv48JghHZGr+LCBu+fnPfP0MApySoM0ScLkngdU+HysKQ1oyEcxZTRoPslqFiOYGdmbTaaioQWWfyIe1Mnaw8swXNQ8aCpMG/auza/KA8uESnDWhtJFi7nm8u5lrIDUn3AZtCY/7UJYXAko8Y/ua5HikcYSVZWErV+jDSH0QWaRYZZLXQXtX/iUOuohj9FVcZDlmaFp65zHh480TPiCJY83ak0YXSa/+WC1HkS5wLMkwrtxK1dNp5NHoBRxgJM/0d3CDIPVjhvl0k4GnIUBKS6d+fo8uzR8YqlnCQp6zaHr/Uhb9DaLxTI8nf9YJarXMnXuLVpuL7NI5uiDTK1j/SIQD+OzAKXfnONApo2hs9jTQnaPBKilcNPw2oJesCw== X-MS-TrafficTypeDiagnostic: AM6PR03MB3832:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vcJjd5Al887h2Dh7GPpzcsglyTc2dLKZt1IRkGZP2ZkhgJ3VIUz+BbUP9rpsEsExNWl/xzvUdm5oMCE5wDFOWMSJ3BMxYqojFYVXHBXc2usOvKh2/ajlXvape816ilCgHYRqQgJOLEhuXPo47qbs7lZkrrniZrfOXqMaBb9HzeByUzOo7hzMYxvGL0ry8f0zVJq0+lKBm7ImlzVKZWJSrU2HWNx+VIfeQs95zeqq5/JclnSXZ87H5FA3VOyuhIbrBosIZxo09qLqWK7k2bHn02dVBln79xB8E1h1dwO7HxMW2adw2kcwfsVLOZFKdzywajNEx48J2XzQhN3vE/L/a6INCHSsY74E5PCWRbO2ulY1J/5UFDdlYZ7xw2BgO6+cIbqqqek5gEFE0qeTy4MZ/+2DB07DYUhIBtHAIxtwlV/cIxZRSE5AE3KE3yW98llTr9Al/uS3S3twHiBVS5aGvbOlhBeGaSH2nBGCVUI2tN3P6Ji0+Mc51AyvaACNpNPgkOCoHjfzT16qxl8Anit7GhI367+bTBgAMHbzIZxQMXyYp4PWdQ23AtfUJXVXJuqmEJlSxht8EYiV0KuMr0EZog== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ny0xHhmDfTHO/JmU92C6hOvaywwI1Uwx/7b+ZDnz9Mbbong59uBt4ab07cZ+kf2zd52+Wjgjolk5VBhmcNRegndxdA3P0iT+eQHjqK/k7p+ttcujU19a9YvSHLRbAB8HofoAzY7PksaWUmsOn6la5YPS3/YcxOSajapp7pEV8RBTdNWQyGJM31ArgGRG/s57I6GGE4fUCneerT1lVeNLZB3uKlTb7EVUykYqIc+Rz9cJf3F1g74t3Y0Y2FWNCn4FcPVb/PXc/BJj797amZeghvijh6ryzmmgka8YriQxzLiK71djZ3bS7apdFg9NhyqR6LIVcoYqXVgfvO5k5hOeqi3SFXi6hzEdd36hq646MhN70KjGY6YljY8EqeqDHZFRC3CiSCuh5OARVB4MlBAKdyZHpLTYIZiX4W4azS9SgtJVDF8i6soQaJZgWFhehe9qYdDY7f7Fi851ovMPE6G6rAntS1jmU/fIfdoIvKnUslVaKD7VNJHaOna0Zd0TRijFxBW4IJM6AkdHMz4a6FeXVifgdQuhUSRPwBrg5eVnxiEPzZ17Ej0OeVUBKr+yX8x9pHaqCl4ySRpHVTlwA2utmHGnJRwXGM/tUzAokThLdpo+IwG+CxxeO7HgZfvlPiiuiAft0PUICY14hBrxaY4huZprHBStUv4NSBeFStzo5ZZWByxnU+HRD/jGcQWTCCcpoi6Za/bCJ6yMk56o/XDP7kZ1Vg09c0oYSqW627Ym7rXpcSC/Lgyoieu3umf1OdkRAFTQ7RpQAq7qEk+4tbIY4GM/PsjoPSbqcYTuGrSanQQzKTr0X8IWVbY+g0TFRL3nh1dde2/hxWWw0/WkWCAfegJnj6RREuARsIaP/GvfeYZrBGRRn4lgOR82KBWDy3xYnXSWezea+vcTK0wFbUJA9Td5QIBKZQ3NWJQHAedut5AhpI8TVYpj1Rc+q8ymHzYnd+5fdejSUmzxA8wbD5UWLw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46e1a6a8-2843-403b-ae61-08d9ba88b795 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Dec 2021 20:24:21.0181 (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: AM6PR03MB3832 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/movtextdec: Fix wrong error code 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: ZsHIwdVviCFg Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 63709eb54b..825632ca9b 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -294,7 +294,7 @@ static int decode_styl(const uint8_t *tsmb, MovTextContext *m, uint64_t size) if (style->end < style->start || (i && style->start < m->s[i - 1].end)) { mov_text_cleanup(m); - return AVERROR(ENOMEM); + return AVERROR_INVALIDDATA; } if (style->start == style->end) { /* Skip this style as it applies to no character */