From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id BDE52450C8 for ; Thu, 5 Jan 2023 21:10:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 983F868BCEB; Thu, 5 Jan 2023 23:10:51 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2044.outbound.protection.outlook.com [40.92.90.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 414FD68BA72 for ; Thu, 5 Jan 2023 23:10:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fl2jm/X78U/eAJeUXsLxDNNbekCLltM4WQIT+5ipaJeeajKuTkFN6Gtvo5lMG254N3N4hxMdGHjhxqwoCIypofKodTE3pvlKePZfJ99LF7IiQNqmj3hIQz0ziFkrycMBVEZeBgkf8bMUWXe6ZJ7RoGO2uFdxK3Lkq7OszbDHRievK72H90ZMFIPu+wKggnom69CIRX94qcKSGGOMRIdXRv/88yrLSH8W2NCBD607xr8BnTX4NM62bI8BKBtRBDihgmso2hDhYNlOB23wXsJFK8qtxqtzVnM1O2Jd+UY6gDzz/x0NcpHGusF9RThqe4qxhziEgp9j5To1N+KwMGASBw== 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=vukAQjCJME8ZiUwfwrfvCKLaIZuadcaRMxHtFSqRSb4=; b=a3TbyHCvoHmeV4jh2O7pr6+3mXAqpE/VOCoueeJ1F8hlhge4T3uGMfCtLsK4qt6YBFRRAP9J5KQTY8vgIaDEdViNsMNejpiZBVkhPATrdbB9KRbz/sYfhFTrFGGw7liMu/AZVKE1/wTEm6+RDz4PM4mzVe2CGSIHEi3sHwhPcPBhY30EpLp0yvilKgb+lA+Rom6xGU6jVXJP89syoi2V079Q94A2PxHwblFnFkSyEspuoloIaFwrea1l/IjE5+H5WudR53CBg9imfoUxlMHJoixFDsUhm4LW1H94ppu5++6tOzWzkpQJUiDHAlkI7bzRVtL3/wRsASRmCCXbV818CA== 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=vukAQjCJME8ZiUwfwrfvCKLaIZuadcaRMxHtFSqRSb4=; b=PvtOv0wr+SKbhIOueCvioU4nRPdokAvFDjqGjeWu40I7R9HfKD/4UukB3KCgoVHpRpKv/hMHtl43a1oFgs+I7DieM0e+nlYKWi/KOESbBR2nxLy3OUTfDgbNfueXZSuAIRMuPTmF7UsRqpM3C5MV0ypJ4sfQ2kqt1SXj7cm8zxRN1Na+JkufXJCbMEnQoPMZg1pSmrqTa5fwzKd+459pIaCSQfhgQqS3IoaOFPBSQFpzk632knof1iW5TAYjjNFjlnczi4YeWBJ239xVRG/IX8LdU7EJs2KxTIPo5jCJYYHR9C8GUnzJXR9qCencOisVXcJfCJaORqwBhaUqpC8A8A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB1019.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:422::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Thu, 5 Jan 2023 21:10:43 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::c37:cabe:316a:60b2]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::c37:cabe:316a:60b2%6]) with mapi id 15.20.5944.019; Thu, 5 Jan 2023 21:10:43 +0000 Message-ID: Date: Thu, 5 Jan 2023 22:11:11 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230105205842.1442824-1-tim@ngus.net> <20230105205842.1442824-2-tim@ngus.net> From: Andreas Rheinhardt In-Reply-To: <20230105205842.1442824-2-tim@ngus.net> X-TMN: [bBYvHsiHF89b5+UgxnOiWsBIRhRqGGCF] X-ClientProxiedBy: FR2P281CA0005.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <2c652964-14d0-19b1-f90a-c4db5758c801@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB1019:EE_ X-MS-Office365-Filtering-Correlation-Id: 28a37f69-8e0d-438c-121c-08daef614e12 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8zCn7JmVZu6Aa8tKS0+RI9Saa406jM3mxlNp1odbspEGBqXeAKIbWoZumCeHoz42UeRrX+43jRYas7FxALc08Uy4CesWd6UCpzl8Jd4N4wqCRCH04xB2oNbM4JQ72YbD1SiS1j3aG/BTubI47YcI92/3LwWHwpLkevtDKxfBc0Hh1ltOi4nNrMomdKhzjCEnKqKimvhpFb93MwwCXiQE7wjGYOJI0wJS3U7D98ygQ+/5dNUrKB58goYR3sx4jGBCTOoOutG4Lwit4LkjVmypEpJoHGdoMMcp6nT/+VhLJ8gBeIglKyS7wu1paKcG6mQyJ8WTrO4B8EAJw0QMfjw9MRKSVX7FSReAs+Gp1Et6RN7sHivsqNB6XLDSbPdq1HMrqcour5EkqqbTfhCnogi3m/8mVG5k188TKucFFFMVPc6NqsYpIg/1yrJjVA/otVhOu822zyebtihYGo/RXo/h4ubVbq+MaKu0BmIZ3Pyra2Hk6NLH3K+A8dh+rW/ByNIkZpJdky7apz+IMiClY9yXkfuQiXnUwu9dQOinCg/8KXGmtZMXwkI/k1/n3k12oEPE8eLadTqBwH1PzHNhFTgxj0DyRIVWRU11DS4KVWWN05mGmyma5l+X5JLJ8MU5rRBFaUXSC8E48hpeUxs9S7Forg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MVp1Nis5TnB6NVBnOXNDcWJqUXlqaWkvSEFKblgzU2lLcHkxY0lVdlArVXJa?= =?utf-8?B?RVU3a0dOZ1B1OGVoNXJoL05iKzlMNi9XTHFOVmZnbDVjem44b2JkUDcvZVk5?= =?utf-8?B?MVJPMVdmUXRNSjYwQXpiQStlcS8vWWN1V0o0TkpOcGtwWHAwc1FLZzdCL3Yx?= =?utf-8?B?d3NPcHdyTjc5cW9panowL2N0STJlUk5QMGVmNHB3TXlPUnI1WVpMcUFuVldp?= =?utf-8?B?RzVVZGUwTzVpZU0wTGxzY0dLUm9FTHRJakVwY040bDdOUWlDZEZGVUVDanor?= =?utf-8?B?SGNtQkh4MzZQKy9DMHlHbHQxZURPTWk4dU5wME5tVXRzam9IY004OVpKNmhV?= =?utf-8?B?M3pFZnkxWjgvM1hnZHcxcytFSjRnd1dIZmQyTDgyVHdwSUVNV3g5R1N1Z3M0?= =?utf-8?B?QnNXRjJ4UGMyeDBPbjBnQWpIUkMwcUNxbDhhWVdLdXhTNW9GL1NESXdaUlo1?= =?utf-8?B?N2JjYWVSbjg3M2xRd1JmdHhsN1NTcVZtMkZyZ3JqNGFZK0prNWRTN0dackVN?= =?utf-8?B?c1JHV3MvamNZQkFtcXlFZ3BFNmpNZFBHWkdpMnFCSEt1RTFFNTZNejhia2dx?= =?utf-8?B?Yk82ZXNnOGVpVVBzeXpVQnA5Z1dzMW5YWCtYRFg4Y0pRM3lKVTI3OEI4RFEv?= =?utf-8?B?SC9TRGRIN0NSU2pZTTNpdm1CTThIcnlMaENHVURaM0cxR3U2bnZzNTUwQ1BS?= =?utf-8?B?c0wwY3dRVnZNQWdEcjdFZTVvMVI0S2IzYTFoUWNMVDhBN0lyeUJwL3NCcEhS?= =?utf-8?B?Z2xKUEZlWkJRT0xWYkl0YVlDdXVCZzlRcEVaYUg1am9HMWNXblJha3VOQ0s3?= =?utf-8?B?d3RDNndoVzNpcVlKYnlBaW42OVdaZGlwZWVaeGx6YVdmdVZza1E2RFZQNlQv?= =?utf-8?B?em14NkQwNVJiT0o5R3h2YVJIMHVZRTAxR2xNbTdvYTM2a09XZFRHL3FuQ0R6?= =?utf-8?B?TElpRGJya3AvK0tzbDdsZWpZZEYrTDVvSGtvTVFHbE5nKzZlUFZiR1NQS0o2?= =?utf-8?B?WTZaQjdXemVPMlVZSXBKNlRwWUNHK09BQW5qMkdEb3Y5dTJFK210Z3dLdHlV?= =?utf-8?B?VVViaGQ3a3BIcER2MXdKeUxUN0xtckc3N09pakVvMS9UQS95YVJXeDV4VGsr?= =?utf-8?B?N3puNzlpMVQ3RVEvUDdMdys2dDhiWGpRU01UVndFQnUvQ2dadkx1Zmkrb0Uw?= =?utf-8?B?N0V1NkljcHZSd2dITSt3RlNSazdVWHowQk05TzlKdHROckdzZ3dTbUdDMEpM?= =?utf-8?B?ZXc2bThIa0NqL1IyZTlHSnBuRUF6WlpFRUZGUzc0NmFDMmViRG1ITnBNOFkr?= =?utf-8?B?UUMyclpZNlFMWjArRGM4SU9XaFVGdlQ0bnRTVVlqSmdtczN1MW5vcGtuWHc2?= =?utf-8?B?V1hpT1dCTWIrajQ2U2pjeWNKTmRoLzVqbmRJTU5hZDBRcmhvQjFRaEYrOE5q?= =?utf-8?B?NkJPRnFjTVRuMnhweEk2SS8xWFlHR1ZnSE02SVZoN1JjRnBRT21wSmdOZk43?= =?utf-8?B?NnZybVpBbDNBd1kzS3N4OFZ5eXQyUllnR2xBY1JvKzRORFBEU1NVbWUwaWlS?= =?utf-8?B?Q1lFYTFtcFlKWUw4MHlQMS9RUDVmVzNjQnRhUyt6Q1NaK3RBVk1vMDdVTUhR?= =?utf-8?B?eGZRMnV0VFFVSTY1TWErM1NrY2FobUpRaU56TGEwNUJWQ21NUXluSlVQV3A5?= =?utf-8?B?VUNjalA3MnlhTUFKTFVONFJIWmpjK0NudERpNzh2QmFvRE1wUjExWVRxdXNl?= =?utf-8?Q?TOYvgbaib4tudUDn7k=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28a37f69-8e0d-438c-121c-08daef614e12 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2023 21:10:42.9675 (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: DU0P250MB1019 Subject: Re: [FFmpeg-devel] [PATCH 1/1] avformat/assenc: fix incorrect copy of null terminator 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Tim Angus: > Signed-off-by: Tim Angus > --- > libavformat/assenc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/assenc.c b/libavformat/assenc.c > index 1600f0a02b..07b6e3a171 100644 > --- a/libavformat/assenc.c > +++ b/libavformat/assenc.c > @@ -69,7 +69,7 @@ static int write_header(AVFormatContext *s) > ass->trailer = trailer; > } > > - avio_write(s->pb, par->extradata, header_size); > + avio_write(s->pb, par->extradata, header_size - 1); > if (par->extradata[header_size - 1] != '\n') > avio_write(s->pb, "\r\n", 2); > ass->ssa_mode = !strstr(par->extradata, "\n[V4+ Styles]"); 1. The rationale for the patch (that you mentioned in the cover letter) should be part of the commit message. 2. Did you run FATE with your patch? This should actually change the output of some tests. 3. The '\0' is not supposed to be accounted for in extradata_size; extradata is supposed to be padded with AV_INPUT_BUFFER_PADDING_SIZE zero bytes, the first of which also acts as trailing zero for formats for which extradata is a C-string. (And anyway: There are cases where header_size does not coincide with extradata_size, yet you are also changing them.) - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".