From patchwork Tue Nov 30 10:49:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31839 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7465372iob; Tue, 30 Nov 2021 02:49:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJxDN6Prdpsl2CR0W/IakbMXhA7HmRkygX4R5yICe44U5IwpfYd/dC1NfmxF9pOxE6dharIc X-Received: by 2002:a17:907:3fa3:: with SMTP id hr35mr67188896ejc.397.1638269392092; Tue, 30 Nov 2021 02:49:52 -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 x72si1776329ede.97.2021.11.30.02.49.51; Tue, 30 Nov 2021 02:49:52 -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=uGQ49RsX; 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 CF1F568AD93; Tue, 30 Nov 2021 12:49:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2071.outbound.protection.outlook.com [40.92.90.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43E9868019F for ; Tue, 30 Nov 2021 12:49:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GcnUaM1KM+BfN6FuA6OB9qrbMKQ2+G3bn8GCry4Mfl29ky5V7U+V/1OeuwyBsiYvY0tc9aTnvk+ebdW+dJXsBwS3oAgy2PaU01fkJOe9KD/6xZytsAJoP4SQbg8QC5N0OYN67mnA1rvgu/7TIPqsjJZQUVh+Ua5v0zmJY9Dd+P5LSGkFf/7eJ73f7uze9b7X5w1zjJ1dHllw81/oGGKQ2Zal4Yi/2XOTyjwsuPqgxivb0kyaOzLHKr4syqhnsOFGxneghBARhaNWxfn4VFf6bMh+7SMWazGJ0v+Y4aG1bnfG2bFh4nXNjwVeojyeygy6Y43Rw0wXqCBoR1p3buKdTQ== 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=ABJSREGiq7k0i7GrL9IglnV94PM84wR+IZ2QfZJokf0=; b=X+Q+zCcB/xWRl7zx3JTJ+sMxzYJBtkidB1JGl/E9NgXcWnmFDVOEnXb1zyE4nmKkDEcsQ5CIxXVXAL0HEb6S4truFc8LTwSr46UzixGE9gDE+X0zJuzH0nJjz4ZEQDwIvkEhH8wbpVJkfFEODy31UZvIca6UbVe8KuycIwy0IpZ9IRh4sqAFAuSSfGSo5h06QiFym6tp4BAkFegl2PgWSQOwtAFH31KOzcy1Asjqp1Grp0q8x0q7oZqRmjlSdtlHWOAsUojgSa5liE610gMHEfOn4ZnUTfEkxM5KsbhtX88uctd4R9m4CpwbNqlw8R6WNMJC+I312Y8BmQAPXEMt9w== 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=ABJSREGiq7k0i7GrL9IglnV94PM84wR+IZ2QfZJokf0=; b=uGQ49RsXvBXFTWQSb9Tfj+rT/xOXImkCCjOTJUPEN/mAIn935o9QsgfDIrqywNBVILljDbEA5pY8g+dLMMT9YMCfo0ifVr6AN1eWe7hSEnQzt3bxNhWfd6985uuya9svMRSDkSMuDQP3dCAZxtuIVD0h5pNbOiqCY1mafKfuMXBkbZ8lOfRJstVwkcHJwoRZmgJHnhvZgpXUa5Gc4C6gCzRPpnWHUdnaTLghfjuu+3ok5+nd6uhYi2iqyxYUv5FWVR9vo2rwnIvRbMZ8N8uP6s2BESFZSxD7UyFkGYlyviFUUhZoOcMTCe0aV50UP//KF2kKK8Oo+3CN8J9k/DZIng== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6215.eurprd03.prod.outlook.com (2603:10a6:20b:13d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:49:39 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4734.024; Tue, 30 Nov 2021 10:49:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 11:49:26 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [Lr3NAySvsuKiXONPcGtkIvXVi6FT/xzf] X-ClientProxiedBy: AS8PR07CA0017.eurprd07.prod.outlook.com (2603:10a6:20b:451::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211130104931.129412-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AS8PR07CA0017.eurprd07.prod.outlook.com (2603:10a6:20b:451::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.7 via Frontend Transport; Tue, 30 Nov 2021 10:49:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 73be3521-c5b1-492d-d8f0-08d9b3ef1b35 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ7g5p8v69jsJ1AbrZo25YYSYCpTvLcyzv6zRpgjwKQlZlpOdaUHzIAU9dPao4v98ANEm28B/2mu5F/ELRXo5zw5NzL0x6l0iupbULvtV5bLS5RI8ScZJKBGH2PmurjV7rGtXOKQQGBxK4UhEfQ62TXER14v96XLPERpNszMmiJ24Pr5z4dtSIK+ReLC+Jal3NDX7DN7AwbbtTCq3QCtJXpTQ8PJU2QH9ld+whxm21VGrE3ee6Pmssk2hZlQFpDedQu8AyWk890lWiDgxIcEQ1kHeLyC2+2pJAfApk1KE79aIEWFpxhtUBOSQdWk21TaEbtTVJlFP8KzbwdXxLOAcGjE2akcp07cLfmjAG830yeyEFMJay99llI8Cha+dNvC/l44Y2aRmsPOjg0bSiROL6w1VMinNbdzlCs+8lrLCxBmWDBINJX0t2ZPsuQcl6Rk6nRWsR0dAmv0AqxrbGQLtvJyy27ksTkypa+VWlCz8Tq9cRFM8uvd2BDD1SsNhhXkB4BvjrXPCD3NOvlhrjCkf3GlR9/7a32DIdwRkN51RNFx2bK38vqLYpGIKgymolcdQnEXJNJQ+mcmxW6z7acpzlqBKwuwmMVRY6HdKu7phwHEBTc+ljaO2ODkMnRmuvDzcWz4WKR4zefxKT84lHmQ/0BsCOSxxKqQYLq2WxVitIWFecocXp8aaREMWqmPZCPB3wv7Nm/MoqmU60wRfM71fDLt5kX+0/Ugy1kklRVdvnv/5MpesWezsZlEIDQtuk9hTk= X-MS-TrafficTypeDiagnostic: AM7PR03MB6215: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BHkR9s1D2rJc9dDfmDUlAMC40PyKw2UOf3XUI+pVlsfl4S1TJehuF7nvk58X3hUhAxum2YU0Kuvqe3ACaT46HSKic0Yy31EdeMa9Xe0Z2uM9vh560dYMRutMNKWPVruIQOk3l8iINIpuN6z0oZOxJuQ/9FkkkTlBo1VjRbeYzdAHD5aB+ucd8KJ8Hw7ke40hBBW/m0TxrY2NaJvrEEPlXraMu5Xb1dgj2jv7tlLIiFfTM7WjA4XOQgE8qc/xSCjqLIS5W47OixzR4tVnExVP7A2Oa3ggLIRg560OXOrbICmV9xPDJtob9YUeXTCkXwSCM7rCcUCLj52ydw10r0mLCURsD2qs/2KjmqYLjhI9/UUyJWij5Bz0GfjOzuAgj+oWVkbOWzhoBmCDtVphJhc9Lo3VyNCEo7h9M278Bg5MLavycV2eg4YvX18wOlpILmrCiRSjV6FULqpUNZyU8o8u6B+df6JWQ+acSXtL3bpBcyWC91EWglSzFF9VNxTNccXtJ5ft+z1HrRpGEpXWComqeSrSjb7VB+yEINFGhQKmVxZFTeODtG/DTugRPsi6aWAZN1uRKkdfiLW3QMb3Ukmkqw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ezJzIWJ0UfmtsMl36O/0L0EI4CSjQpK72Zf/a/vCoeAJYh/XDd9fCHFda662Y47LRclEuVrzAkggnF427XQv4l5qOtmK6uTXeu9Y2ymttZR9QN/zbZTK9eaLkjjvwpfElr/Sf/J/14roQbOGGIjvGRo+iahjwIPQZD0WjCylh57imOz4aPT6QwG0ZWVtrV2I5nxaa2izipsoiiy/5as8BAbMXo+vHVQm1Km7XNeSFxAAT36nhrn1wy4WC699ZvEjCJ1ZchF6GB/7pL3C0QZ4h6Yg5vxZ+0cfhgvz2lNwjxhq1clzWM9ilWfKUGgScV+by3Wf49I/wL5K33shc3T9nZYNWk6PpfwRrhd47Rnrp8vigPS4iUW+jzSWIyOL9fGOUv85KSP4mfMISD2LYzTpxL7WhkPrGdfc7RIa8ZC9M8m7vKpdLIOAEIrGd5WOZZUWY4NRtkGnK0c/QYjBKQwYbDj3JnKRRp0Oha1y7tcLwV53C3V6ZxD8oxKkczTUGuE2xr7+jI5B9YkvP1V0PPLuBtlVqh3nHdFdmKplwCqMubbbdMnB4EPzGzuUNxer+RT7DJof7/t+gTVhjYW9h/nSfjFRc+Zi/iWqzT5Vmfc8KgKUD/fzzBeDXAjZyP/aiYkTWuUMNuZkKzimH1HQ753zSRsmmJdeuXGDDTpLuWeoge0UJ3mCjDC+8SZDQJMESVu2+xUOJL0pZMkw3Hp44mC3UWSpcXNt+8Zs3XMIAVCaRKg+T01UtZfxFJdLSCUpIMGYp4JBSAIU0jvJtX9fNXtFt98o3CRGRLpIwlcEpOlSDmgURs2t4mVQTKJDiwO5/uOZNrjXc7Y+Xyc2ZAfp+WKjk/xPLl8w8MChq1jWU+QDce5vN1VKho0UfWasb/dwDfRQpimhD6mPl57037a2fln7u1s6XPhP3IZL65zgI0aYKmyFeD2Vrs7oTB4HVAyLSyBH7eg4HKs4MOmzTSBn0P5e8Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73be3521-c5b1-492d-d8f0-08d9b3ef1b35 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:49:38.9862 (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: AM7PR03MB6215 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/movtextenc: Fix infinite loop due to variable truncation 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: iL0tNzlKzg3A Regression since af043b839c38e850af1184fd6be691f8475c048e. Fixes ticket #9409. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 2ae5a9bf0b..0632463a63 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -84,7 +84,7 @@ typedef struct { uint8_t box_flags; StyleBox d; uint16_t text_pos; - uint16_t byte_count; + unsigned byte_count; char **fonts; int font_count; double font_scale_factor; @@ -584,9 +584,9 @@ static void mov_text_cancel_overrides_cb(void *priv, const char *style_name) mov_text_ass_style_set(s, style); } -static uint16_t utf8_strlen(const char *text, int len) +static unsigned utf8_strlen(const char *text, int len) { - uint16_t i = 0, ret = 0; + unsigned i = 0, ret = 0; while (i < len) { char c = text[i]; if ((c & 0x80) == 0) @@ -606,7 +606,7 @@ static uint16_t utf8_strlen(const char *text, int len) static void mov_text_text_cb(void *priv, const char *text, int len) { - uint16_t utf8_len = utf8_strlen(text, len); + unsigned utf8_len = utf8_strlen(text, len); MovTextContext *s = priv; av_bprint_append_data(&s->buffer, text, len); // If it's not utf-8, just use the byte length