From patchwork Sun Feb 18 01:41:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46326 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp552509pzb; Sat, 17 Feb 2024 17:39:38 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCW+zdLeb2ScfGVTGbQkabaltRu0wWulnq0VhCSmd6fMHYY7gFAwS9nKQQGRGuvs6TTakaVSeTwQymvisIHVOPir+noDMOWpaEUklg== X-Google-Smtp-Source: AGHT+IGdp/MEwZwNpA3A/rcz3qmiBleo5MoHIBdSLCvnbal6/BlykMCoIY2eLKn6yVUu4G5KV6r/ X-Received: by 2002:a17:907:37a:b0:a3e:3633:cf91 with SMTP id rs26-20020a170907037a00b00a3e3633cf91mr1361625ejb.48.1708220378207; Sat, 17 Feb 2024 17:39:38 -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 qc19-20020a170906d8b300b00a3e0db6eb73si1192100ejb.280.2024.02.17.17.39.37; Sat, 17 Feb 2024 17:39:38 -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=ewkYciEO; 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 E89EC68D303; Sun, 18 Feb 2024 03:39:34 +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-vi1eur05olkn2084.outbound.protection.outlook.com [40.92.90.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFA3A68D27D for ; Sun, 18 Feb 2024 03:39:27 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cBHsm/f6MsrZOxjSC3AxOlQvryyOebz2d5NToHt0cL3+C6jySvt2SkSV5iFLcElz7g5UEyXboSPW9En+cKUZK/5yWCBRVZH9a111YhKbr0ux1KLJ3NK4C8eIb15UhuWHdYSrI7KB5UuetjjOazE61eXB4pD8wkRnS21664omFXTABkhWi1wQ81SNXm4sXtqS1Gz4QbK3T4AF8Epvh8lUl8LxJzom4Uj8qVeFIanwgtzlJn21ogcDhjyY/zFANpQGKY4E1tualx7pWhFkTYE1OPFrjWNV5xMdvmP1Agl9mDtMoPp5R8Itkf2tTeja19Y7fi0BX6TcMLQ+oSYpUg34Rw== 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=/chAYVP/UzgYTUPMNvsJhdAwiGQ3UEgnKAgzvjSXQiY=; b=YZxnOmyNc6pTVVRFeS7w0QieFnB6b8FyJi6xdwAIFcwyMt4NlgPYacLspKlGFk8l/s6TFDOUxMBCHC4zSMiEJqQxVld8gYD47efz3bZzDaCI6LkKLE66k9V5MY7P3/Bu0Xq5bV+E4r51+44PgiYbc4rBFvEJeHzj0X0GjV5gFSfpM7rYrMZyFXqCbZsX7ENLZyFXG/5/VWifF3nkjVruv+DgL6BuUq5iXiTGsbUV+/Kfn+bwBTk1tIVpNXWbpeFbuK87Lha0kdhb0RLwNHI//i+++8aA8NsrlCCxO9Ci0wFdVL9j6yxbadT7MS1GsmTC7LN8vAsm1AO+8m665r93DA== 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=/chAYVP/UzgYTUPMNvsJhdAwiGQ3UEgnKAgzvjSXQiY=; b=ewkYciEOebrOcGRIBTTpGa152P2WXx61df3YA0u+Ky3E+LylP8n7ika/QBUMQ6rdn5Ntkr0RSvgeczEbrPFGOTQ818+2x4/X0zu2QViVt9EgXC9MRUIHj93Zhwu4KHnQBNBZDtwSpkJ6VuyNsM75iEpUAIQ2vjzIgyqpsefhqIttzpI1Cg7DtqC3Hy8fXhGxNqUa0A0z0StB3ALSQq8oT9LmsFUOy31D4zMbC/UmL2G9DfvlgLG/nXyPp9D6MaBHExdEWF2nBP2oi1+HD9T+fq/N9AOxIEIeLoebrSdnPcFoec3eietwc231vaqSKY6lcRpX7vr7gWEslIYTIG3EWw== Received: from GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::7) by DU2P250MB0319.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.32; Sun, 18 Feb 2024 01:39:25 +0000 Received: from GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM ([fe80::ffe3:46c:6214:2504]) by GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM ([fe80::ffe3:46c:6214:2504%6]) with mapi id 15.20.7292.026; Sun, 18 Feb 2024 01:39:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Feb 2024 02:41:09 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [y09fByK4fzzjFI/5v4N18PHJDT8fG51f261eIhpGBu0=] X-ClientProxiedBy: FR0P281CA0102.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::18) To GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:109::7) X-Microsoft-Original-Message-ID: <20240218014115.2819369-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0063:EE_|DU2P250MB0319:EE_ X-MS-Office365-Filtering-Correlation-Id: 5e654bd1-bde0-4a7c-0905-08dc30227005 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TgZ0/S/QwP1mLttvz6o6NePNY2HnXdMuKuAKmDQ26Jev+jkG7VhUYiBijssYClgTg0TlMctXFFJgR8fRVA6//BhXVi8G/5pW1QxFpOfojTK0qip1NVAZ+A/kn8XXcTHaJ82oxy/zvtIRCe8EcKwTswyhUe4URH0ZLmU2DmrAdhwo5vqgGTqzXKsy8sVcwkmwanVhh1GNZ3xOhWi2yvZq6VbT68aEgdRbF1Q03H1NwKrVU3lc54Ou2GTJujkzw1Pl0coVbrPmTBVD89bJIEk6di2Iju4appJ/jdy090WwlX0XACfTfx0vEWkM/lA1xI2XPtvpL96y+VycY4p44tnzhHVrAJURQnOw1WSh+OFy8qow/Ok2YcxJSqTG92X238Fd24pS9svweWWul8kOUzZvG5Xye5jji3nYSK6BTMPu2joOuCRMBuF/cLF0Pu93emrFMRknH2XquqSW5liMQh/Inp23XEKhQmdQikAyMQ8K0485ikP7Btw3sE33fT1DbqjgWkHWLMtogXcgv9BCl7cw+9OndUuRxfygHYa+CDhw0kelBDIcSo6EnLq6224nlxptUB6vrfci7XIP7n0G/PnWOL7nQHeaoKJXLdQQZcN16KCcSfYIqVxc8s68R7AMQ/C8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: F+207N+XxvKlhYqUpii2gGjHnXOyFsLzz7vHBnn7vs0VZ8RbgfP1Gpzd5b8LgBSj5wkNGxR8rYx02imba3/eOzEzQjouo3cQdKBIiBR2FdgiNA60YjvZy4Te41Mb7tihn40zgwM6Yukxu10WMbS/tQl9MuOyoj8x8DH+ig8tQ9wwAgb0OFsdHUgzEmOqZCTyKOURcvajP6jP86AV6Fs8FVLmIJS7A0a3q9o3YH1mKdNvjh/F3EIf8HbfXrZeWjTfrqvlac/CYOYhnbFV62652UVpAkWm5hDBAkMDP9oBslBYHH8aedkBzFVdwl6L5eqoPgps990BEsDElfzVh9p4/+ukAT5EXW/BUoqdc+PnbTuuIzFXebLu8bozfZVG1x6n1BFreP+1jf4SvPDYILVW/KquUoYAQP6v5QjwD8t3GPJU/yjUeaCHartqAgEe7vszAZ7qZ0TDQTcjPMTsJCz2luFCyvHgaoHxJcsXw60Q07g/k8eKJ7Ri7TAsGpYUJWFPyhujjxRCzZjf9Em5yvDkHgHfIhjsirsN4aImfexKGN516ZMnKlHMv13E0kJzkidTDhzAWATFXcsq+jMzKfKXd7QtaiH7pm90SeKHkUs7bXW30DQnZuY98lJ5hRdqAIEdYd+wmTKoWw2TbJ8rLs4ekRNxRDswxBeJI46PqjSN4ZUCBLM6CiXx5n0C+10Cbzf8465XTjJW7k/bc11piNUEUuQF0wDi1d4yFjX9x8qbbPrJZYpm0G3RHZo8rbXR8cpcscp8vMOtxXUg+4zdcUVxZg0lndFBpWYqBjIlaXWwtf5G5WH3p6JYjq2tHcCqSQ9WpjnY1RRtTkJCQFdKCd3308bQa6s5UbsxBGIJoPAAorRM3pcH1ioywokTT341uiQcHaZIDEt1v4cQZp87xhE2FNyb+RTUMcYm4P+ZQ6blu71SXQx+fzO6UtdovK8alIRXEQrhP1B2Oa1eoqB/mcl1XZIOSeaKgMdV48Y0oKRytQ4M8QxZVMcnXQX/5da4djJEoiu8+9glWqNqze6zq8dAketVSm0IV4USg1PxEAN05tHHOh9ewCakfRNiv2oFo5OsU9zbAN/ePp93Rwdq5CzI/u9lZ3uQgrfYxfSRFBk+6G5CMD6mf6zlmcT+fYk7WaPqvayuj37fnpNBvmrXBPaEjdWCsN3jdEOlwoGEsPHYhJthKXggOmNyvKZQUxTyFfUcAQXZRHDR96GVxCxE0AtX4YtdJyKoBS59WxBiAOtWOb104zlzKgqvrgVMuBCM4nGss0zS9LIo1G9+GY04PxLQbA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e654bd1-bde0-4a7c-0905-08dc30227005 X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0063.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2024 01:39:24.7893 (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: DU2P250MB0319 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/assenc: Use size_t for length of string 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: w6o2xm+IL6HM Signed-off-by: Andreas Rheinhardt --- libavcodec/assenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/assenc.c b/libavcodec/assenc.c index e548b9fd3b..e734522729 100644 --- a/libavcodec/assenc.c +++ b/libavcodec/assenc.c @@ -45,7 +45,7 @@ static int ass_encode_frame(AVCodecContext *avctx, unsigned char *buf, int bufsize, const AVSubtitle *sub) { - int len; + size_t len; if (sub->num_rects != 1) { av_log(avctx, AV_LOG_ERROR, "Only one rect per AVSubtitle is supported in ASS.\n"); @@ -59,7 +59,7 @@ static int ass_encode_frame(AVCodecContext *avctx, len = av_strlcpy(buf, sub->rects[0]->ass, bufsize); - if (len > bufsize - 1) { + if (len >= bufsize) { av_log(avctx, AV_LOG_ERROR, "Buffer too small for ASS event.\n"); return AVERROR_BUFFER_TOO_SMALL; }