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 From patchwork Tue Nov 30 10:50:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31841 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7466593iob; Tue, 30 Nov 2021 02:51:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJwVfw2DJ60CFG0Xc0BF9tB+3mT6YSQhOrDVxMyFA4h48BpMV5y6xfvZqum/saEvhVgeGviT X-Received: by 2002:a17:907:3e1d:: with SMTP id hp29mr67083736ejc.70.1638269462632; Tue, 30 Nov 2021 02:51:02 -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 c14si36787521ede.582.2021.11.30.02.51.02; Tue, 30 Nov 2021 02:51:02 -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=A7jKSbRz; 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 05181680039; Tue, 30 Nov 2021 12:51:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074015.outbound.protection.outlook.com [40.92.74.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6239F680BA5 for ; Tue, 30 Nov 2021 12:50:53 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QXJERe4bmNyVx08+xM2K0JdGc1dWUFpwPU5dnBC1lhUiE/JNFtXn9iocE946zU10XEkIz6AuKFKScN4DWG7n67gn6m7Z6hmDGLW1iGb0F5OprWtYXjkwnQuaO1gxnvQy/H8VGdTyIFhk+TFyd4JjvxMNUYI6W8S7rMHh9v42WwnBJxxs/ISdNc8Cc1ijRvBjilJRBU521ytaU42K1tPeOoD6GNcuk6h4rjPO+fnOZzBRvipTb2tkuIt14g1R0DSYrRvquQrg3k7VTPXKTRKs2AqHyeGLzSZOOV4bhmnChOfYTzy9FHYpl92E656/Sp+5YsTKqQ8jjj3Bu8ka+f97zg== 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=/lRTxHbw9TWzlmLShbn82S3jYmXzAmpubVpjQJLVPbU=; b=i+Lo+kfFEz+oaFF6BLY274Xu/F2qv+aNcskKN14VTk/6fCXfGJ2eKTsCVlmBFeUJH2rd/3qJzATeWPoIWPDkTpFPu7CpwmuwrzLbGkgRFFcJUZSnSw2LQhwOGuqxUjEqgXtEEPZ3jpQI1jxJ0/qRwCkdw0TGiLfEs9RcVmpmmDMRIDs+yGHfGIb02vnkL+0idhWniK/p+3X1RFebIIwAsm31gsFNiHxsv6EYcaGqWunR8NPKUpfBccZg96L5BfOUl9tyBFp4ZWOWunF3UWPYreNhV0svn4RYrmoWfMo168KZbOTW67i5I9apUzXBPS3P6fGYDxkvkv/3s9+vmgR6Vw== 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=/lRTxHbw9TWzlmLShbn82S3jYmXzAmpubVpjQJLVPbU=; b=A7jKSbRzGFY+KUDXcWKxG7x5ABoDfk+FOc0L57vifgnEmUG1IPOc79PXs/2AgXkw+2PV593qYS04xTKrqtMlB+xqRFM8LsqDrFufZToV3sGszMJQN9rDUZ33zgANlT7bTDfYy7a1p3sOOan8yTQVI6yM+QKtyOIkt2u795Tqn+DoAVjbU0eN28a0LRGC+bBF5+eNUWcOuWdozp1liQ4xNUzpm00dFUp23Cu9pcmPO8Un1a1myyegTPtD5mTCrSyzs7fK1XQFmiCg/oY9st3zAyhYMN+Ee79HyInB2WXoTFAzvsbKAkSDocIsXdJcFnHs95nYTmwsIWT8jRSiF+ziVw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6532.eurprd03.prod.outlook.com (2603:10a6:20b:1c3::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Tue, 30 Nov 2021 10:50:52 +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:50:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 11:50:39 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [UJg5JiPxYLXFCQ1SzDaRA8t009aTWcAM] X-ClientProxiedBy: AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211130105043.129538-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Tue, 30 Nov 2021 10:50:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 207dda6a-7491-4ed0-6eda-08d9b3ef46ed X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUVf4505pHrBHCMEJhBuWzEyNqQ4uLM3RQ5hBYuS/dB7DDW+QNykjSDABLk7ZDfVBU3R0K9YgSm+2TIxeBUA1gT9GD8ytXM4VkdDVx7mPj+xQoCZ9P2t+9VOX9RdLY1c2+hXox+Q8zu3EzMgjqeWX/0VL3KrQxc6Bbev8PXzV0169l71oNXSMljolF0/5iBER1Lnz6Gc+u7KhGA3wR0pXVo9g7IfWfFbm7Zf6mwpDhHMUAxQyIpaoGjo2zP39U1xdfetSOprPChfIryKyMPOcqIlQuHmQxzL2nNUBsP+hSWgad3kwmjVvg+05oH9pT8s6M81jp4ifwD5Ir5C35psJHfz/8R4i/Erxk3XGEFspeB+gEsgVs19y55Ih05FDOO7XiwDLNzZPbDfHLgTVLx0kmUvJ0AP49KWpGXKcI9ohmDw5jVTHxtUx28Z3aXSeCy1zAbYJb6sEZ8J+LOEcNT/+nWrSXVakPUvd4XPQRcc7ttM/PaC3Is1mc2iRLVSX2aqjO0BQrRsIuUaLPYLmTga1tLbpvz1FPPsiTFxHiG82FPbmGr/+MfT/avfu7fxB7cSvQvLQEG+j52HiVCnDRAt7qQG6V8j/fV1VWHdbtaYYSrF3vgODwUjzhuGrACdyg6ZXj7U8xsJOmNc1LbihK8JQe9JadmBhDEIYfYSzEZVMilYPcSj5QrCqfjrYyoDGgBJCLOx7OokE0UrzGvOlwTfBWe7/2Prybw4B4= X-MS-TrafficTypeDiagnostic: AM7PR03MB6532: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ErKmtDeY0BMocAfbEe2xlAWF6IknvxiN3Dar7r5kGGgg7xGXa3zncJcpT9LpA+E+jHYF/1HlRsT+wFzKMrVwi3WEl/pql3yI18d7VoaobGVfEWbJfiyHQ6RY8wjrNv9YQ7B6aEsZuOxUN39qloiLOmq4dVwffnpltJmtl6vl0GHTzdUX9GyQ3hj8LPLzL3xuTsEkxmi3vivBeOoQAJaqZYiwNtDb6K2hC4Kw18ySKr4wyyttzFyQqaBDEeym2JBLRGnqCxosCfmzqyWOB5G4TPuXSKasCKX5qWXD0bDMYvsdGINrfMNnCLIesszsvUNWZYjDb186PCVUns9knts2QyBSYZnUEEoAoimlwsXG0yAWhRYCjlv1zJVqtpJB8khyyGkQuIE4re22wjN7jyM/vi6bQb4VAO/Tbupvc6t+NosgFHdJ8KAlicAOZFfY1wdOPPxXpTsL+hFqDFJuDhn9khldJCFks9MQ0/fZI1GCRhEjmvQ8Zr7ohMXhnW/pITksokfeZNA69+cErTHRnVU33B9GG45TodexpPs0zri8RzBxkaD5eU/sZJslj+m4Pkd4DgfOKM0S1CyZ3n7a4gaLdg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oMoJDdKBNqNdZl5PvRKN7eZ8XRneShp4TPAncE3RiMLOOANAlBdn2MQ85oM9B7D48FpMH4JSOBH3JI+9lrZGKhDju0WkEGyTqS3Z2GEuaNGRq/pekLPaG5xk8JRR2+gwRzVQFk1GMS7Ftd5UhBXIoWBCWVeec84gEzbzdev9aicR3GHv7hDhBvKbq7Czfs/AbAg3yYQlVuyhng8xe9trGHYwuLOm5XJyuXWo2GqzbF8QqtIlgIfUJU2FREx55ryUfPl/4qOXG3eMJoSB96cJXLwZgDm4r1qqu4NIIyp8SSLeI3WQmVkpnWTIXpEhcGkHsRGfJ5J1U9ZscjIeZAUhHUhmMmAqr8phFUuvqMRosXKVBRUiYU+qwsrHQEQPuib3BNQideYh/48ti7q+Buf3pOp6NCDS+4uLAX5OINVYFg0hRy07HZLXoRmlkZkM68XC/1YydOfRe+T5iyABQ53hgIbiUAMWo33NqOlToccFZB1gVxEpEp32jL/7BgWpsEqcx10qNL0TsIaTHYKcCMMlcLfG1qllXpp//EX0M3omgWeuTCRb8XSAyEc2vBpauaw9zrn98nHn0xYlhcpzfkx01lYieMhLYlYq1nT9c3OfXFtQauDisQy0E7+A46OuIXoQ4hEPE65tGDUWPaHiJhae5ozo44BFP/taVY+4IBRAq9rSybqoxfkR6L1hpTHJKShDfvrJnb4mfmWMcBfgnS2u+NnQtW9p6UoclcehF1/6zTE9bx8Ld92J0i2R9/IFv3iQmsSeBdZ0CPNue/XS8aQOK45lZvt/GbNENadOglIm3OXQXj4UFf0frj+87aXZw/yhi1Kz+ko8Ip0J5L5a6N75OvM4LTKvCxdYBLKKw2oux6zzVx6J3SpJMo9ohQTsg51sHH1lfVnt2RJ+HzZloy3SOFDnufCrhCCyRUc/UwuEgdRCSFlsJ9IFkmesKrjYqUWZ537QMVwQ0m3losOgapzOaA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 207dda6a-7491-4ed0-6eda-08d9b3ef46ed 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:50:52.0307 (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: AM7PR03MB6532 Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/movtextenc: Reset AVBPrint at the beginning, not end of encoding 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: CV4ozEobE6a6 This avoids abusing a variable called length for the return value and ensures that the AVBPrint is always reset before using it; previously this has been forgotten in some error paths. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 0632463a63..46109e0a5e 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -646,6 +646,7 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, s->text_pos = 0; s->count = 0; s->box_flags = 0; + av_bprint_clear(&s->buffer); for (i = 0; i < sub->num_rects; i++) { const char *ass = sub->rects[i]->ass; @@ -669,27 +670,20 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, AV_WB16(buf, s->byte_count); buf += 2; - if (!av_bprint_is_complete(&s->buffer)) { - length = AVERROR(ENOMEM); - goto exit; - } + if (!av_bprint_is_complete(&s->buffer)) + return AVERROR(ENOMEM); - if (!s->buffer.len) { - length = 0; - goto exit; - } + if (!s->buffer.len) + return 0; if (s->buffer.len > bufsize - 3) { av_log(avctx, AV_LOG_ERROR, "Buffer too small for ASS event.\n"); - length = AVERROR_BUFFER_TOO_SMALL; - goto exit; + return AVERROR_BUFFER_TOO_SMALL; } memcpy(buf, s->buffer.str, s->buffer.len); length = s->buffer.len + 2; -exit: - av_bprint_clear(&s->buffer); return length; } From patchwork Tue Nov 30 10:50:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31838 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7466769iob; Tue, 30 Nov 2021 02:51:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJwwFicPXgpk0evJb9G1QVd32T2TLatkWrzHBA5lu2vN3+thuQUvbpZ7yeHC2L2tXJV3k08I X-Received: by 2002:a05:6402:100e:: with SMTP id c14mr83342663edu.196.1638269472358; Tue, 30 Nov 2021 02:51:12 -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 hr36si38176407ejc.483.2021.11.30.02.51.12; Tue, 30 Nov 2021 02:51:12 -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=AEqyl8X2; 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 EFD0468ADAE; Tue, 30 Nov 2021 12:51:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068099.outbound.protection.outlook.com [40.92.68.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B683680BA5 for ; Tue, 30 Nov 2021 12:50:58 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=euQugyK1ZXksoKyO6V54DHKYdZmrKNYG/WGnFuZav7obHhl2Vwxu10os3hzjPgLhPq9dGy/smIct61BQW/GYjhMxbfAxNJLEz/Kd7WnM6pW94DdERKXoDcxH+glWariUDtD3qqQctASxHHMZ8sBvoGo3PVrSJaFZdD62JluNkaXlbzxD0RnmsLZLLII+wmy6gGUK3FvlHI1mTY2Wpm8IrtcO2I3YxuvJICkGbJt1NSUC4hCIuwvOswYYsPubUx7+6krpe8Z0FCo6H6hXA4Fpv2BTFMD/zKPsEFmgmMNCOKAP4ZwYRVTu6vrmWVHzd0/DWbTUs/q2sSphKKJ/ABkjSQ== 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=hPHnvIDUiL8plBbooK/HMDGVO0WMBA8qFqS7Vm2MkrE=; b=PbxDHfCkzDYnfN7eZzoqPEqoV7hzRSg2OvAElM+2YD23H59npWLF6XlyhHKOdFER2mJvjwG6zWla/gf6dNXmRUi4XVYcYnz96912+iE24CPDV2TFw+ZzNX4aVOtkA2jmobchmn/RpF7QBq5RfVTojD7kkPOv4jf1nUZKp25SIXBM2r5VpITVMZvfRtlj7WgHoc9y4lQlAEKmrSHFLcHW7WjeWngHV2RRAJEcVNnb+M7zJqsCmMHxw/BHILqlxcJEhcUxs6fRYFKbjEk+xbHvqfGz3mureCznXBgOWeOVwrB5lM7HajmDEeRLX292mITg5uyr3n2xif0DRSgPXGabWg== 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=hPHnvIDUiL8plBbooK/HMDGVO0WMBA8qFqS7Vm2MkrE=; b=AEqyl8X2nS9FL4iHUDP1Ig5LYwoXeSe6/4KGN3Ac0n0KIYuv77VXB1ivq4axfHG/zUM3Wgc1O9D8adOMfh5xy+Fv+Qt8PWvjyczdOeXewcFcvNLvHl4hzENhXOur+xK9dsoeeIs1o+Ji0RbEvYHMitw/oBxqCFiJXIyorfOOeat3BmrXV47IW1L6XBFB5jLuioq0btZ7rFVIqntaQlrJyPF0IpqhhVCzcUEEEPgWxZXoX7h1E+tta9s1Y27rJPTtcdHbcWCF2LWKKU2581Nl2ro0Tp1jc7s3kLVk9JHR7ZuZYZMu7fRtWmnW/8EiEghRnzcJdGGfYJnFDxX8vc++VQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2850.eurprd03.prod.outlook.com (2603:10a6:206:20::15) 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:50:57 +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:50:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 11:50:40 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [+V7KvEZQuQyMkwc1IpM65feeNGoBBog5] X-ClientProxiedBy: AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211130105043.129538-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Tue, 30 Nov 2021 10:50:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aeabec0a-2b7d-4012-1d79-08d9b3ef49a3 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUVf4505pHrBHCMEJhBuWzEPayCIk9F6P27UVjS8sYV7Li4JoTWj9T/5LN2WyhPi2k9hHcZtSDLj3z6XQPI5Ybr6Bnvq67Z5ifqGDv+inq85spOZk+Yn8Yi77HhBDo+MbfHoxF8LPJdF4Jiy9ZDkyoAmuxGgw5ZzNI4FwdrV4Z70CGswdcVLwYXhh5czzwj+FnwVbgZs3oajugfGOKu86ECWNyZw2aeSt5Fb4bhQ5N+7sadUgFwvO3RHM+umD+GhWcJmJoEwgxUOE1kM6uQGhsiqozJLM4NlKqB1rqsoYgSwrPlKGZjJ6g1F8bddrDj8cU/sB4eaAVrEjOrLFiEsia8L6+/pqn6D/HdoByvRPzOaOButy6V8vACOKYuKdhKMqIjn3Gby+DOsdCCV+rPXMytGMbRFynNTnLTDsVKUC9QLWxKhXsC/e5se4Qq9fFK1WFGhMlKTqENiFCQBZ8Fl3yKD8fk3ZWL/bou7CkLXmNxX51H5xyyH4QAcDmSY4szrwVrDzxRwhnFYM32sC+X6vkyA0S11eck5nZy1Yy8aefH0qJNLoZZ8xiZgqDbl5akfZajrfhRCe/rdvv8mbhN21Qd7/indPO7Dcnmq7oFZRHSDnGARVUMpEEFeEyirYCPANtst7wB4xafCV5EqU8073cxwHD2SUbtkPRjah2kU5pHQdcIamGJ23IYj2UY7uwzvuXurtxBGHcAsixzOqOVB0DB0dsjmcxFb2c= X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wB92ZVlOgEY5f9Q1G6fLToTzMy8pRMKPaY1X1Wuv0S3e4Ag6JISgSmttwzV7a0LkUv6J3QAg2AgyqB+FZnoyIiOF0aGMHzHyqXrXtMwWGr2Mg9BdIWK3kegtPUcBoc8XiudOjx3z423pqPnbz56Khobjc/oU2ohM3nsq6Cfc9fXD03UD8TPX0HdAsLCndk2oZHJP7QEb/5Y1636Q9v6sqNU3iEcBxS74rJJeXYHKgiLFwbZd42M07GP8HU8ZIbLbaMRCPKW7P8WXKmB9irJVDi7iXziH3PEs2EE5kG5n5yT1pipQcbG1ZmHZHHj88Tguk/6H84MS7RdUs4WFQL+gvBvbQoI7bPmyLx0bIvjOsvJb3tgo88vT6DzpEhpqCcqXYouAOAV8LA+qOjFUQmydq5plx5XgtRr5aFpSTjFFH8nZjGg1Nh4YdUMsNY+G+0AHlx/PzJ7hL7ugC64W/AuRXLbP5AuEVMGHzJq/JwBuQZUA9BZOOlkDQX8fSrngB2o/GDYYiCaNsOztPkib3nFq3B8VXYaer43hlfDskNytHvH+KDq85We5us5Ll+O3MAMaZKGHUJ1/FI7gdjGnSAA8sQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qy+K+ixwxm7/EEAFTvZh0u5O/YxjDBFodOEKOtlAhLzwx/2lQntKuitc2/3xcKEjZCMChM10by1TF/EBPcTZl8Eyu5ktkeDbtE2IYmDxh6LxsNDuLqhda3QkVf/ECmLQBNv5RLY4qmhXiopby5q48J7oXWS7BrNPbwJZVCJ0gDoypKABhL9hB3DhJktUuFLZHAaAEJUk4/OvzrOjOFEZwynKtBR3BVtq4tJX9dXjzalVjMcglKsySL+seZ+VtJepAhBV6horC1IWZ3cxkopQ0E1NMyZl5eC+JcinmnVy4KCjRgb7SrqKhZps9ULUjygW9jE9Yp3b4X8+tIAwyaFDCwkEVOcGe8TYfmGxJrVzvxFx0v6XqqkW+YiE7IiSkmLl0LQxnLDJlgyQBCicBLgpEkQThZvD/viWpIXcN9FwNxupzMdd832R5EEJjINzxOma7zg/ouLJuAPycdXM9weTv2vlQ+c0gRLV8FMS627BpZSAWy3Q+TiOLzja6xvoNkTaEc3em6PibStHexUX2TUAlFRiqUnPf/FKcqLPK1jPH2tG3mG7uCmZChDZadzTzbWslJzoI5qxmdWOgJ6D5nNWKpG4+nWTuIPi5z6vH4Q6w4Cni8EBw1KhMPmPEiWmX6WGnm/OXi1oHNUwMDnzmGSoRaYtRET7cqniqnTZ5de+v8r/ykEB1W4O1I9bOJ9YKHuhXBSFeTltgZBpy3JAU8ZI6z2FecEkzbHYYagPM6N59zDsSnvOtZ9ebUwB9nWqDMQT4IGJOM+v7S1mvPTJRKMHNT1qyZq7XwyKilA+knNkYHlrBrl3s2AO61A8NVIwZgWhLOsA0z+tl/3OkJ/48M4y1SNGbjLEiPX3IGhlWnji6Rf3ghNhjmyR1ja7U5qou4mBBTzBr6EyW0t1ainJ7tVxF8bYNwyi+5+dXPI7qmaXB/MAlvdVcitPG3s9MaIl7LvxVKZ9j4vgDoajItlawDTA6g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aeabec0a-2b7d-4012-1d79-08d9b3ef49a3 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:50:56.9104 (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: AM5PR03MB2850 Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/movtextenc: Check for too long subtitles 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: 0bDGEElNxay3 Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 46109e0a5e..eecadaf503 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -667,6 +667,8 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, } } + if (s->byte_count > UINT16_MAX) + return AVERROR(ERANGE); AV_WB16(buf, s->byte_count); buf += 2; From patchwork Tue Nov 30 10:50:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31836 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7466954iob; Tue, 30 Nov 2021 02:51:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJz8JJ0+PE9U2eqqfGO5iJj8S/3RNgcgw6o0ql6grgnwy+f5qThUXnFK8+pIpzQ7ky2ZbfBC X-Received: by 2002:a17:907:a0d4:: with SMTP id hw20mr66970822ejc.16.1638269483349; Tue, 30 Nov 2021 02:51:23 -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 i8si24670345edv.515.2021.11.30.02.51.23; Tue, 30 Nov 2021 02:51:23 -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=E0S78hS9; 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 2181F68ADEE; Tue, 30 Nov 2021 12:51:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068099.outbound.protection.outlook.com [40.92.68.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C303A68A3B9 for ; Tue, 30 Nov 2021 12:51:03 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GtwoPhpm9b3GVD6qE241BQTyGfy/cBQfMX5B7KDghSlV+6xgHn9Kg1icAtoDrWI7J2Fle3HB94J/S+7juO3ymSru9y+Yl/4mqTcOoBiSz+LJb4tFiPmo0PHxHRkiiHFxO6Ba/A6RHVTzaMdGlBGPBJ/tHWj6TVCwmk9JkU0ZJ8RY8I6+rgRkn6UcjT0TVN4onbCexEt8MnA+xyfCqunyr2055t3bcamxawqk4MJ5s9vcXuvNpX0eM1OWbCRQcVcKSW/oIiKJacJDR1QLAq2f2DwbnVvI2xeFJl8D0p5TfZaZkRwRVHg7fw9pjjn6eYrTlGw17KEyIW6o7NwbgHZ+8A== 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=XuMTD/w4fHuMe0ilc+j/LSIeRhvXWf/FpZTFTf+HZqQ=; b=R9GASbh5oplonZsXDt9ELs/Pwwv3NLrZ0sea6gVcB7CCeefBJ2FqtAN3CoSw4oWNJVbGIIJE56AphcAy9paAMpsXdGqp1DPPzCPtyENdfPZ54Nu799StQPAoUXRAleV80lr9gChXwm9hsVCd7XJ2/A2ZVNlMKGZeHteFHqHwMeZ6nb1BDM9AlhXiM2U/ZfIc1pb3YONRtBSpoor2/ikfpcIefW9v5wOSAALAnJNfJZq57Rjz4eFO5U4NCAariHJxoDFmvK7uPthptWxuk3BW5hquyQq38Phfhtkdo92Tcb8tAwKR7K2GRWRS6vq8YGDtUlWLADP2g3P0HtO99QNAbg== 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=XuMTD/w4fHuMe0ilc+j/LSIeRhvXWf/FpZTFTf+HZqQ=; b=E0S78hS9qiInyFbGMegRQlJBpT12jwJ/kCc2K0S2CQ7AYFHIpaNHAkXgOBnjuxEqmgxeoHDeMY+x8W9gzAOeHOMz8SkItn+Jj1RVgCCiQ3M8GGEkVS83uxv8cXAms429mPwr0HMotuUH1HZhEyl5nFtkIPdAA8l7h+rtLiBVhUavlgJiz/TNUyObLECEpG2XQdtUtnzUvvy6h5+SzPQobDF6Ci/YsLgMHvSAJUBKI7PqTPTNfbw/TrEYhMKCHBFVDTHutIWNqE0lN4SN8WJiNULalwHw6y/T99/rErclXzC7r5PvZ6Eut2vfvrhc4huGhWkv3yg+DC84Z6As/51dXg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2850.eurprd03.prod.outlook.com (2603:10a6:206:20::15) 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:50:58 +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:50:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 11:50:41 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [kcLfy2/N/2dHSg6x55bjIdMzLHvUq9EJ] X-ClientProxiedBy: AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211130105043.129538-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Tue, 30 Nov 2021 10:50:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07119e3c-0581-42c8-2485-08d9b3ef4ae9 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUVf4505pHrBHCMEJhBuWzEg0ybu4YKP2uE762c4ezxV42X/MFyotel+FKiTwsYl1z7IeUGUuIHjJDOFUaxOtHh4iVGgDMLBHkvCJ13TZeNT21ZnIWdpPPVU7tyRGATfIgx/neTvshywXjZRtygqo70gxaRVpPaD3wH+YmsncYNptYvCfJ+KzpuyPEWMOjfdCbo5OtZFfPWShJ2wKQfTFFJsiueCpma1zEiGYf0VOM4oU34D+O3Soj+uF9SLzrNgHM7naHgNe8mcz3s3GRocDYVGFDunr+Y1kpCLpFq4K3O3eRnT49ZoyPsVWAY19hqynBuj0NeUYUSdXvDKVpODlfUxS7+hAFK3htv5KIZ5FN41o/MiQ27bj72RKouY8uIe5dITGnX+qC/v4SmUox0CNQHm8QxWSded4SR8AslaNUCDQbXU6ID7wucD/ucw9fanOXWhrp+T2NjX1/adXVqvIzMT67uZAxJZCzrjOeQVy6qskzZUipwMnsf1AEzvkAKhg1ixO+kdeGza8PUQH6nL8k18+reXhhUGJ9OBIcm6YxEF2gkvjHnpg90Fqku/3ukoDl/5QDbh+TtenotTxtYlHbG//B3Bjh9dt1C/e1QmpGsAL06V8MBLLxShfhSwY/fbBNpWmFy1DkZ1KDUxgqUFkg0Z2EsA+hcEkOZENS1NDbUDRcERKGvUXJBZC3pWaK6JNbs1Q1GF/iiYsFT2cJfkFVgvLT3oboQUBY= X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 58mRCgg8FyJ4KeFQlW/5Vr+xO+qjMR3OuusGJ9i6rMkN/I4Wqb3+XSHSnQUWrGzmX7Pz/G1Vc0X3A56HuOCh/X2nsRir0aUkiBN0TUYBdZd8F5CBpWn9yX9H48LYsuJ5xemUXVqMFmRuRtpQeHRzQf2NfkCDizIEhYek22FV06zDcXDAbazQg0rzRBGjyKhWhLcTkuCCDNNCSdSJtmNxLy8AfH0lS04lTTQ4Rx58Y6sClQtUfiGLuyjhDgj4sXCJIs1RpE7i82El3D3shq4mdrxwPkCpEyMD5vy3WLLlV/KGnU00+usW4tihOIba+lPc3TXFVmaeFOU5lEFvESgtiKzUQB4fAd+4va0lG7kjzPeHWRuUI/M717muwYmx4odx2749WfpXtP29ZwvUK3hpqtvsul6lnRl++ktlf17JnSri79GB17Sn8jH9PLT6omBf8kSLB0zgIGoOfbXlNh8RFmG6ypZk0GsZcdiAqN1IU1C6aOgu7NRaaedEPvDaBh8R7qg12XjmUNx/64xv1ss7PM0hutT56wg2I5QJL6yZP5OTDxAbkC65Qxr2UJRfklW5jlymrGc4JIZIs7gosCSlqA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dXg4XIQSAMKZGVZQS6l/LaUFo4V2B6dJXigKqsqiSSzuGBNeR5wQIVj41W6rO0hxDhnNQN0QfLa5g1oXQVuC0mSydY9SgpxJ8F651CLZhAMZ1rI7Mfs39uCYveXIFax9qEbsz5kahYtk1LGuoEglS2rdAsg5Rj25PhZC0NK3EfmFQjq6qaBAgeKy74iyh3F/yppmXMnXGvu+cMJZiO9ud04G39+rzNU89Kb/lsE9a45YzfFI1/bE7MgxXY2fFy+ACcq9ahqt26DbDpPK06+KQ+ZUoNCz6uNGsOsLRH1XFoRGrWpnTxpcmazMuKe0qhwUlmoQefdAC4u2ICFFVFv9j71fvAiWii4XucmKRjv5FP2q35Fk7qhLnWC9kDyvJ5UfUhEyuAyTXQ+KUJdLkkigRoDcJevMMwymrwkqFGBhi00pISQCUjlbVHgQihIkTsyuM5fAlXl9rMKPtlUlAzOIso5iKhpIocAtlMxvXUKiWLn1cKfnu+KRB3g5+zgzQ8qUlh5T80FANMDuYVY7lExq4sfwUV2q3+vg9VlGhovwXnjNPtOiylK4GoiQmNO2zxBVRNaV2JzI8gp6CJvEBHym0/vpuC/004e/iBoToI+c/b7r0y5LpzqsSM9M9ge6kzZFhd5l0tNuR1lo+6onTx39cM7YnILJ5831coA20GkGZtXLsdOwZ42l1eXAA8VW5SnZTimgD56qho6vK02dk8YT8CzzQhWHHNjjuQ8wtytEKipKO/KqJymLkZJwO2hNGHxTtp1jWCBr5d2nBvUx7tANrUJBEUS/HU76gyGQVAvgVl9aGF6HKJOqY8pk6/V//qDFFK00ACjLhXXskqFTwc8/RKfiyEG0aHzvjoZvy+SgBx8OIop2LqSQo1KS68hYPy+Fvmgwx4k7dZUjKg3W5mmGJZAC3PWALIfJY1s5U54iJqKplB3x6g5W1jS9AodqDC8sqW2Mtz0V5aDoFKVvQwinEA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07119e3c-0581-42c8-2485-08d9b3ef4ae9 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:50:58.7155 (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: AM5PR03MB2850 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/movtextenc: Fix encoding of subtitles with multiple rects 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: IH76HxZzrNbm The format of a mov_text (3GPP Timed Text) sample is: uint16_t text_length; uint8_t text[text_length]; TextSampleModifierBox text_modifier; Yet in case our encoder receives an AVSubtitle with multiple ASS AVSubtitleRects, it creates something like this: uint16_t text_length; uint8_t text[text_length_1]; TextSampleModifierBox text_modifier_1; uint8_t text[text_length_2]; TextSampleModifierBox text_modifier_2; ... where text_length is the sum of all the text_length_*. This commit fixes this by writing the TextSampleModifierBoxes only after all the rects have been written. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index eecadaf503..52e51503d6 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -640,7 +640,6 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, MovTextContext *s = avctx->priv_data; ASSDialog *dialog; int i, length; - size_t j; s->byte_count = 0; s->text_pos = 0; @@ -661,10 +660,6 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, mov_text_dialog(s, dialog); ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text); ff_ass_free_dialog(&dialog); - - for (j = 0; j < box_count; j++) { - box_types[j].encode(s); - } } if (s->byte_count > UINT16_MAX) @@ -672,6 +667,9 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, AV_WB16(buf, s->byte_count); buf += 2; + for (size_t j = 0; j < box_count; j++) + box_types[j].encode(s); + if (!av_bprint_is_complete(&s->buffer)) return AVERROR(ENOMEM); From patchwork Tue Nov 30 10:50:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31840 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7467121iob; Tue, 30 Nov 2021 02:51:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJxdXOi9CGUIqlc/Cavl7UFQZZSl+XW3s35wKmnzACi0NFfzDnVhM9ef710/vevR1x1VgDdy X-Received: by 2002:a17:906:86da:: with SMTP id j26mr63038348ejy.19.1638269495507; Tue, 30 Nov 2021 02:51:35 -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 y19si35265346edd.123.2021.11.30.02.51.35; Tue, 30 Nov 2021 02:51:35 -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=o7aMj6qj; 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 5765968AE42; Tue, 30 Nov 2021 12:51:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068099.outbound.protection.outlook.com [40.92.68.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA28768A44A for ; Tue, 30 Nov 2021 12:51:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hNDSd7SgZOTDX4a+S9dQyTYrex/Rk4NmJU638DC9xTjUFXBULssg+sg/XlQDRN/RFSR1xtxXutMgjLSFTv4C9pBINB4n9zsiq4w4albBZ5YfS9c/HNZwRvfttYBnj+N7AVg9ixt0vDv0XZeg/PyfzIRX503gN0rl8SoHtmmzkkHSMQw2Dpx2Pmw5DxvVcMSHje470UpVhtWw3prmb8eFje72tcj6WCGxWm7bx1MJa/wVn2wyM4VuwSxDVoWBeNv/MLz99y006O99omrl2yZf2kkHha9iDq3TU5v3xymnqmGnOnBKpvHU3gI8+Rik1Q5VmgmzQh4Ws4KtinjYEBRG2g== 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=mGMQlsYm37wIwSUQb3Qr5IJvt+TeQJYAoz43F4Xjhkc=; b=lIDfuyG0Mx0anL+b6K6sisC4OLIzcNgeaEM+ppn1AKgNw/TTKdccTJduTA01ufjlJNIMhqv6R1wgqJJ3DOQbknbitmNz1v7MXUbkSAXYuLu3LUyekeoWLfDL62gtDtAVO0AF/Q8bfs5QI3IRQ8RFe+sF6e8oqoQKn9jf/cWutm02AisY2CUurKP56bK8tD5w7DkuoEnz5+jhCic6Z0J/rqm4w+L3uJpO3m4NipsxVHOuudqB2xNiXC5J+al0BnU+Wr+u+ecnvlfazRlVsHJQq8ArniV33J1pUXO9WRe8rEjMojGxpXQSPtTkO/zAsYky0/EpFhgsO+/HuvcuD1sc4Q== 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=mGMQlsYm37wIwSUQb3Qr5IJvt+TeQJYAoz43F4Xjhkc=; b=o7aMj6qjpxfdmfnj6wtsZXux05PcQPy5opn5+EdExVloqa9w6BxxbauvwGZ3dsMOShHdkXuSdPuMWnOSqk0ctezCsTqCF0dnEYGdYmOsGBrlOnCj43GGKaFwjIzzHDfkDu7hUAwNwktNqqn+B+SAcKRZw4sxeZ8ZzT/HI1H+wRqz86Y1FCOiohR/3RToNEhwYtB1Jn0W+lN1X+s17TLxnv8x9MBfLZZLulPBMFe7nKdp7PVPYu7xhbLfNcEGrsqlDdh6QBlSlu+oV0f9Qxngmyg9uKr2AaJI7m53C/cUFLVKqXDkudCarhgdMBOodn/qtm+a0icOEpI5fyIGuFRevA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2850.eurprd03.prod.outlook.com (2603:10a6:206:20::15) 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:50:59 +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:50:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 11:50:42 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [YM4+mbtbkGpxw3/7LIS4TvP9b0NxuAYM] X-ClientProxiedBy: AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211130105043.129538-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Tue, 30 Nov 2021 10:50:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b3a549fd-01e5-4ee7-4ef6-08d9b3ef4b8c X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UIgFldYn+1hibg1CU1wBpO/Jc2rrk7ogScZll/fge/ME+dVeCYd0YObs0PlWiptx1gHY0l4GXJMPfq6jKJ+1I2sHsAE/d3sEl2IrPbjvW+RlE1Y0T5qegfVpx+pa9kke7x/tI5N1eP+mfAS8f8wXH6fIYNBxGeEEMCCMG/IqvVdJ339sxMKFosK47BO1zeaJabiLo40hZ/JqsMzpX88erP6YeUUvJz7F6Oq9GP/bMXoe/PvT6lKxTi3EweP7WwCbdW+DExlU/Qe0Ts4fGLNJUqejZSz693QbGkwse1uv+Y3NzRTKLvOHLFTEtUOUDSg8M2Gos1EEUMghZ3vY9tIMlB14d6joSffo+Z5a5SHtBB96CjcppVYe0aNe+2SRwBSINaP8FEqHT0YKnEjCZaiT3ANMYmEcm21UsHoy7dgTLCn5/ACjZ6uP6Z/ZOzCkXqQ77eLBOinMHmr7/ZJdxR/V+9+sfDKwq5K/+lNJ7pi1WkXGaMGVAB2krYdusovjIrfcOp9ZEPTrIFQAPOhvyP87s/MvKRSs+lfpT2UqKoG3ErM/4FSLZnZWbhaPCQcbNH01Db4AYms5dMKCgm92DZy1EwvkUvZLCYRTN3dWO8olyXJopG9spxRrSDM4TARi9IBRdSGQNX+8DF5bf53eIZ9id1yOR2Xc/jIBn2wHyeHt8nBa1nyPUlkl7hNwI9eHZF4iNyH2o+zW6KVsQ== X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VDfsWHRUTCAWYwxZON16zMJ8PjfUJH8IxbAr2/nPZVtt0idQqMpiqwb3SBJhgcRUYKz765VYl4B3rNvvFAMvX5NfXwP0GeW2HtK1YQEyHzAn/fLaWcqpxfvhrEC6WOd83YhFVhjKax/+2sr2b3F4tRaUmlpoSSUTBaEaTVh53pvQzi41XjREbQwkcUruNsBl9Je+U1Sla6l6oOfy33wBfm4kAOesdZgorY/wPgK6aJaE4ObRHa+/WDjKFTCDQEOFIPcgvAvnroENjqrQxzgFkdTicr0p06jUUsOabZ7wJWvG+L/RNMORihXLrrcV8leQI+mb944dY8m46oJVxpXweG1MA0iTcnhYAtJukd//gjMLKD4xxaJLzxj3hbCgBQzATSi1/5kXGhelUGSnJymWnC7Jb5f8L1JmBE9hfr4aZB2u8BDe6HPaiq3cL6NyoRZi+DWFRw7AW5dQo4H5f1sviu39tyUHV4BXq7xAcpjVRrwfwiVmrIFdHTQ1cF5+/KrlcNclY9PMAiWf7RMIUSa8e+r83R+Ar4P49/Zr07cTnaPXj56ZeAqnDcDEX3hJ2s27MlInmmHH2Wb5H6QQH3bmuQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0Ip6j7RS6Y1umhmJEGGn0C9ZZbOPXQMGIaEXsj4jqJSefgNeAB8RZpoebjwzaXlXrX7fHtEtdTHyzcCGPUmSncTNehrjEGh7vuQfztzSyfjwyu8q/IFQjpdZwR/pTLoGtD6f5hR6M7LZMcRNBguTSCSN2xusJdBrhnrQ2FSkUwI5a8PpLZlMvTe/s4+aGsEcKbbkCSAzXspg9r7FohXSZWdBuNwZTymhvZZAA+Dych338CcOL7TXQQq+gwJxkjVzu9pi5K5jctHjC6n2cpCfgsYkK0y9hzL1VopEYegQ2facYcLQuVHFkgRjREIYqQdNEAtAmtBhVA/bKiiFLc8r/xrUO1dKjiE2uqKhtk8UMNVW14f/t8oqb7+maMHjvrz/ci0gRg4/uKaQWaFx0UXeU3CdBiyKO5XxGg7HN7izHsIaT/tJ4wxaqZAWdUxM6u7izHrvRenYrmFMAtJQ6reNFdc7Ebj6T/AgJYzKWu7BzXBnozRAo8vr1UzLJuDlkuRr/ORuQ3oOigzUtSxJqGv2BEH8ZvDQ6ar3kkyfSYZD26mYru7Dfzd1kOikZG2vvGKHsLnaJpSOY4gHHouVAkl9oYH2MKbe17xhEH0r9r66gJIrXZxCSBjKm1Rc0VNDeTkBKNnFekxgcTDA6Rmy09yCLthZOiaXcqZ171W5VGJVvA3D8VDdtBZVHVUHSV0w67keL41tdPfpf1cLoxTFQ9HtHdq6GBujt2T+LHuwWygdUMISliyuzmZr5lxHEwLf52grRXMn7phpaznQlAijeBhLsdafQex13BGnZ3WLEjg0h3R7ao3Qp4Q6Di/bEELsfpI2CWp7etoWbkG40Hfr4+Nf+ZqJSkhtrmTMZWS89wU8SxcSSbw/raQvvad+q+raqFS6UuMv1zdNhoFd5jTv3GR5vnPPhL9RwJcIRbkDH2GvICrbKPDmDDx+O76DFc0V6GWRdgeG3MudCdVxb2UeZPR5rg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3a549fd-01e5-4ee7-4ef6-08d9b3ef4b8c 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:50:59.7938 (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: AM5PR03MB2850 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/movtextenc: Remove redundant byte count 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: i1dhewwvSiOn Use the AVBPrint's len instead. Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 52e51503d6..112af41093 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -84,7 +84,6 @@ typedef struct { uint8_t box_flags; StyleBox d; uint16_t text_pos; - unsigned byte_count; char **fonts; int font_count; double font_scale_factor; @@ -611,7 +610,6 @@ static void mov_text_text_cb(void *priv, const char *text, int len) av_bprint_append_data(&s->buffer, text, len); // If it's not utf-8, just use the byte length s->text_pos += utf8_len ? utf8_len : len; - s->byte_count += len; } static void mov_text_new_line_cb(void *priv, int forced) @@ -619,7 +617,6 @@ static void mov_text_new_line_cb(void *priv, int forced) MovTextContext *s = priv; av_bprint_append_data(&s->buffer, "\n", 1); s->text_pos += 1; - s->byte_count += 1; } static const ASSCodesCallbacks mov_text_callbacks = { @@ -641,7 +638,6 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, ASSDialog *dialog; int i, length; - s->byte_count = 0; s->text_pos = 0; s->count = 0; s->box_flags = 0; @@ -662,9 +658,9 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf, ff_ass_free_dialog(&dialog); } - if (s->byte_count > UINT16_MAX) + if (s->buffer.len > UINT16_MAX) return AVERROR(ERANGE); - AV_WB16(buf, s->byte_count); + AV_WB16(buf, s->buffer.len); buf += 2; for (size_t j = 0; j < box_count; j++) From patchwork Tue Nov 30 10:50: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: 31837 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7467314iob; Tue, 30 Nov 2021 02:51:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJzofz/QU0H5l2yF+pGbAOtl7I8G/7wFLD20n4FuZ5oltX/8xYN4LXscqqZScBl7XmLK2KJa X-Received: by 2002:a17:907:a426:: with SMTP id sg38mr67322262ejc.392.1638269508341; Tue, 30 Nov 2021 02:51:48 -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 w18si25607847edq.29.2021.11.30.02.51.47; Tue, 30 Nov 2021 02:51:48 -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=tQnr5bKp; 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 5AE3768AE4E; Tue, 30 Nov 2021 12:51:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068099.outbound.protection.outlook.com [40.92.68.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2A99868A44A for ; Tue, 30 Nov 2021 12:51:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PY22m3Xt+nt1vkpjBBPz8oEwdYieotljU0fIpcPbKIM5UC1Aw+MPYkil/0GciJd7x+o2ty7k2Fto7TYrSU4jPkTaXuisQdAfhekeC+MYwYIywm055hvMCIKhFGnS4GUKakXpuhv7pjlOqeZRPncMrlse9MdSUfG9SNcifYreYO+XTWQf4xtyosuHU/Jr0Hui0vl8qIs5feGKYWGXpqStTApuPd8wKkyaz5TKp04RZj2LTmnwNfRQJX1PtKUo4NqHq7q6sN9S/oA6Oeb8RnCptb19tGCxDtoZUs7vHUsqHTueQrRN1Q+9ZfnWrxEcaadsPC6m6DqYbL0F/k7iz6hpEQ== 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=/gEX9D/3EFq0MKdIPL1wsdTkxEU+qVRuK3VLFKqmlsw=; b=ZpJ4mJwQU5qZJX53rlsQ94NgNDSNKVsmpouihPpV+01lXFeKDFpJYOG1nOfQ0FIFWCaKPpPx9dTvvqVJqYI+qDvy+bSzUbtSlyK+uLAbdeXVw5cSn5RuLd3jzbNw8DDh7NTGd1x9Np3fsE2tLID+XubHBl/c7Mpzcp/asQ0k8yuuYKyWffTjQKwSXZksTmMvuelfDpQ14gPRcnaI9hY8iWIikpWBimfJxJqPor2CvCiSI73egaT2Zs3BtrijF0vUASCbeuv6f1wUoDUXuIwNSj6CMzOKlvr3BCFkfTRHlMWfoXboX69FIsjeK5sGo0XyTHqQmjfG9ATtom6EBU8dJA== 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=/gEX9D/3EFq0MKdIPL1wsdTkxEU+qVRuK3VLFKqmlsw=; b=tQnr5bKpbbu75lAxCB3Mk2oBe1HPVwhTHZ1vgUBOqElrywrxdSxvYSzJRtcuUG/1ZJDiL+kJ+PwpBxHFQWsUFJSobz9hjUcY99FP6QYV6PXnWItdrIiL9sa4MgHTJSITE4iCjbHBna1kIECv+Kfa0/7K9ScLAZQLLgjEx1EXjlmIrtgY7Ttw5sk9Fnnd217kojGIOC2BHx9PS4TduiJUsBugyXgspqlfQnKJDpTZM4dFHkwuwD6LfT8F185M63pd42Ji7wF8OYldIUv/iBVT/X50Cv1qddke0MVOU8xg3lhq46kIFoZY+PmgvNTcNshNIyn7JL0AJn20l7BFEHV87A== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2850.eurprd03.prod.outlook.com (2603:10a6:206:20::15) 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:51:01 +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:51:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 11:50:43 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [x8i7FsLBAm74eap51Ee7P0ZWj6DOKbfq] X-ClientProxiedBy: AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211130105043.129538-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR02CA0156.eurprd02.prod.outlook.com (2603:10a6:20b:28d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Tue, 30 Nov 2021 10:51:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9552f42-a559-4e50-6e0b-08d9b3ef4c57 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUVf4505pHrBHCMEJhBuWzEPayCIk9F6P27UVjS8sYV7K3xkqnIbBbNY3e9AT1YuNybTPFwcPCtaCR3yOhMf9d1dWcVePLfuwpFcB6buwnQD1Nl5w8TnMXtBo6i9D5aG/gBIl0UFTTvaEFxlUy92iHB40LfbogUpMndMcAkRYp+LWxAypnRNSZpRzhePCHMmbTSKlVfHqfKxj2crEpxzxdWCew57i667PsOVcx1Vmxrjn5DXOhaARurnsKXv/WUF7V3OGzKMSamuLNR5NUQVmc9KUi/ihhAKttHNqetL2V5oYo1KroVQlmy/13dAdnr4dqpTSasCCpoA69a+gdqH/Z88kjvZ17RGTedpQ97jUlWpKn5oWp/g62yHqN0d6vtOq8rd8oNmjrCCgUltnsAymfhqIEHSPQl64Ca6gPbBVxo7F7pEOt5oXkvl98mPZhB2geTZB5f0AfjMomjcQ/fRSxaq3+PIbm+VQdU8C+U1yXY2aUH//mwTdbgGQOAV/wvb+sC2xfWNcgx3Zo72CZrxMSflWSKJh0xTHEk7jfjqGSrOsFJyPx8zvwTIkVqFO9N6FBoYB0gCedWTWKKdXOnpRkyz6SR/UFX1cGAjGr4bhSRV6zXzn+UimmL/F7jIxLMZ8RTfQJ1Qpm8AVWTWzM+Gfck2S5th7yz0/8lVg05HXzDJ0a8cLmSIvliINO5y1eyW6GUcEF02xTsjUFfmfkiOfKsZf0ulCeM52c= X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YGwAyxq1OAWYSLUb2nsf6uVdTy4D8MctKknbnNMyPd1pVAslMaVZNw0I9ma+eGqWCQdF4cKgyFQOArPwMWp2OX6qIr6m59QzC2h3XKxHkzXTYg9dk3W6hwgh7dPZpWH1LDO0TK+fmou1n9Z6G7AbRNL6RLhXq9cXNj61brs4FXRmpns8G0z0vyF0QsXI6N/CQ64LP8ggi2to2PToaqw6/yIU/WY7eIn7NKhBphwSAjn47ahP4J5+OrILdJgH2r0L/evwcBXaTXEHSOFdrm8FSVnunqi0fWlPiWHKtSDQ6Sihepyl+ndW76f79wYRDcYlm+EChv1Wl3ekLupj92VeJCcwVQf8h76N48lTtpOJMNaNQgBTrk/E/sMAwSX5iSY6E373nt39KXw9nYt2SIxFHSTMzaiiXh0r/KCWvwqrF1YSSpJDQk7ayAfAZsACnK5z1KeiYSLab67DrL0paIGsM1nXKhOTSxeSrnpX5ebW8cyExpCoq7GP0qbMueIic9c0ffo/yIoMUQHk5Al5jCJZqacKVlzrWaENHUtIh53JKd5N69aWOEQ+g8vQ7NksVtdeLYmlo0GCXeJsc0e2ZsIlVQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tyFaPXmqJJJbcX6KodL1lE4b/AUSlAoub6U16NLlmei0YaZK7EwIdbpY5SSifBINTb0OhI0JAd1TSQ4y6rZpbzCibt6aAsRzft41dzZV2Ri9xTPyiUxSi5GZfzAIHfgT/uqFgX3KkfF3aJ/81Fzretq/ZnPnn7FVks5ANmh1gKJZqcR8FsZXnYtyNeuox/XKitx5Usrp7+1vQQXuf2AS0QoNstdzA9aBzsaMieZOcXhNUhBQbEJ5ftAeEGGhz0KXM9kTz0kwLLe15FnUO6QgPC7KgepLlex23hLX3SV8pXXZhRN4d1k+I7RLpXyJggjxIgbvlqMax5jRObsz+PuDGS7bHOOprR8M0Ny67RcxQQa6EsNhmIPda8BYrwd3NOygq0If1wjQpFvlRQ5FVKSndVeofdXIt2x5XLT3oNOf7OsX8k3ThN94dJD+OgzUKx+MXetPNAu7Z4B2Tps/Zk+CWX1BVDQ7RC8jpzDDNvn3VKarUx9S+1I6sFVFOn0wvwPiRpTMjyGBSI2eYRKU+4aGyfZ5gTA8jeFfC0Ban72C1Xs145h0cmffuNPL2dO6Pu5BrERzxuSjl7t102sTSAO/jc2BSbUPpAVK8FGXwWN5R47gr66sQ5QM/rMIwk8wGaB7rFo7sTqObDcdUqEBM34RsCBLeD4DeraeRy4pH/WQfjAbDFdIxEKL/Fw953lvnegUvubaRLNjWgnujqQ3D1gez/Mt0pFhG5xRLMdxffQ3ukNEf8VO8wvGgXSlUoqEZg1uSfbrQxvQR9QsiTyVD9FqOn/nCsvg2LDO5yPQ6QT5uTYbJiLMdEofc50n1rA5aeUgx8jtRb/d4TVIOBRV8ptDdVmxHq9TLBwmr7xPT2Zyid0UpmpWAtTf0lnX9zT5Igb2hlrGfOj24cP7iemAFslSTAxX0uupmXz4wRnEtit7F5/eBMsGOKjngbUX9IgCBu6kDUC3Y7PLIa1RNq+crtbllQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9552f42-a559-4e50-6e0b-08d9b3ef4c57 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:51:01.1180 (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: AM5PR03MB2850 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/movtextenc: Simplify writing a single char 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: X+RT8EmPW90D Signed-off-by: Andreas Rheinhardt --- libavcodec/movtextenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c index 112af41093..5869942ec0 100644 --- a/libavcodec/movtextenc.c +++ b/libavcodec/movtextenc.c @@ -615,8 +615,8 @@ static void mov_text_text_cb(void *priv, const char *text, int len) static void mov_text_new_line_cb(void *priv, int forced) { MovTextContext *s = priv; - av_bprint_append_data(&s->buffer, "\n", 1); s->text_pos += 1; + av_bprint_chars(&s->buffer, '\n', 1); } static const ASSCodesCallbacks mov_text_callbacks = {