From patchwork Sat Jul 23 16:35:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36924 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1108193pzb; Sat, 23 Jul 2022 09:36:10 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tBee7MxR/nIU0g+LVpljJpGS4r43yM99ccptiKla21V3M6MZ0uZFGjXj07aeJ7ZeA9dhwf X-Received: by 2002:a17:906:7308:b0:72f:3294:8002 with SMTP id di8-20020a170906730800b0072f32948002mr3786013ejc.311.1658594170209; Sat, 23 Jul 2022 09:36:10 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n10-20020a50934a000000b0043aa8412576si9076270eda.227.2022.07.23.09.36.09; Sat, 23 Jul 2022 09:36:10 -0700 (PDT) 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=MrFiz6sr; 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 4C4E2680986; Sat, 23 Jul 2022 19:36:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2040.outbound.protection.outlook.com [40.92.91.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 387BE68B2C8 for ; Sat, 23 Jul 2022 19:35:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FA1bcGMFubnMBUNAFP4cr4I/p8z/7UYvybJ0kIJ5hk00VklY1A3CLBiuumiMlkFjVT8rBRANl6ma+GHM/DbTKP+h8cj+dW8iyWc1dOL7pQLWtqhGUGQFD0xYqdtPPYmyx5xvgBj5bTGH9dfCRrVQPiJ4xI9r8j4Disgb00OZGxOYSkCZQT5Vzy9zAkVFYbvMuHXAiGt9gq5j6gq84arP+Lywpk34m38oRwG5oajzqlDf2r8GeMJud+gHhijfj/WjtsDeWcunoRZKAqR0jMVIsREMk9vq4KYovlCnuct02Tu0ik/qhi0smz+7VfUS4oe/n5gBxgQShN2jeOkcGrtEng== 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=tUYH6fMClYrAfzLANBelHQJalaiYnODscu3FiNwLmAQ=; b=j8LVn/rpm0aljAofrvBWjdBP6RywQESnXHR1vEiOfNahXHJBWPwWMq9e0jDJsg9wtX3i9IyibjpkLW0pcp6gA4n/bMCvhyiot0Dunaa0EvUK4dQsBGAlOkJF5QVPBcYSX7GJaY7zXYAG3of4eL2DkFimqI5jo3sD4/0F5HQ8j9Xb+m7I7XAIxwYxczGV4lA8Imydys+FYrzCa05k9I2qMdQ0SNFYQVzfYjdr3mp4TVUk2d7eOcLsI9Llt88CziKizCCgN8Mnf7tBbZYMZ6wvaoDmIt6QtDY6wZh/gGd6OEKTaA45BHML4Qu4r+Tjxw5rOsFHsEPW4GqSmANfQBvrDQ== 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=tUYH6fMClYrAfzLANBelHQJalaiYnODscu3FiNwLmAQ=; b=MrFiz6srcUKUclmQduft6MPeqqOqzyHHG3Gq89G3lclpPRCxuqsXejHk5ROyGnai2aA9HSUkJm0zxNtQm17WJth8pm0ICBQO29rW6JHRt6MBYL3DvDV3owHrIbQKO4VlmxOod8+R4BjhSMwSKHS400Ih5qa2uvhEJ9vfNigb5B7K9eY3ESU78ojq6nvE1v83q1q/4Y/JPvCTlL32gV7vj54st6fonCJ4JK5yI8Lc1aZLiCLIrI0qxYDbgSyW7C9oenirlkjQDejpAmK1ZOR67Sv9Bzh0zRNVoLp2q56wL4+35cIlna4QPQxoLlAYSmJwbLDMjs/lnF1wvvrGYaw4KQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by HE1PR0102MB2620.eurprd01.prod.exchangelabs.com (2603:10a6:7:18::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.20; Sat, 23 Jul 2022 16:35:57 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5458.020; Sat, 23 Jul 2022 16:35:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 23 Jul 2022 18:35:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [3GoAcMD9iEZ/K9GnpFzGDTkJXkGs2lIl] X-ClientProxiedBy: ZR0P278CA0096.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::11) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220723163548.603563-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c1c7a09-321b-4c5b-f05b-08da6cc96b69 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUrfGsDrLJjeMBrDnbWtuR1nCTWh1Rd8ehfKo4n5XtvPOauzVLiNuuWbM75RPr/lVkjo0SbHiPCPJLPO6LSTqIC0u3vR3hA2+xUwXXZ6iedrGI7N2NFQnwHM1UB0ge8fngM4xFq3fI3BkwvQUgP7exptce+8JRD5SpjBLYDeP/uvxmW+RP5PDqeo94JY92P87R1dOJnh9P+vh9SP2owLfSxPENp2rRXsxp/Y0EU4pDtkhypnjsaIUs7TIJhve1+sJFfErYPWhMtXe3lIjqYpyRpsMmALWxztQrwNwYZSkdBxvtBt86jVZa5JkkD9y3QedNLB3er96v2ZyyjBvyjPQDDzlR9eTDznFc5KgzpuLiHwVi/95Yla7dIiqebgXG84bWuoJA3Y/5TQAGIiwHUpPCeQJGYig2OObhTD2q5YoK08/d8oojasiEmZzPpYmKMs1NQMd3x0NMb7CrCZhRaP6lT3Tum+CEtoHdoMZmB0rZAn4UxFYRDRdooRCAgqb+6K2eBeq7SuA3kFROEMqaIuj2GC9SnUOz5C5I92hc44zHNxqPFC+bnCONaTrp3AwshBqdduImB3SzS/YqrBhfxurA84tt7GeNont9GAxSgaLZrRAgLu76XDTd4y5RA9dgAliP8eGbHwhgy1LZoDvxKF/dglwG9rT1j+K8OhW5jhOuawMt6LOPN0zvhN9X1chXr1cfoy+a2jn9Zdjfm3ccHCKOHlQhszs4qHA0= X-MS-TrafficTypeDiagnostic: HE1PR0102MB2620:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WPuVnJMHAiUhRMk1LYmh9Ey0aW0bLrAzGoJs/2J4AQf3PW72L2futGPe+te3WVFMEwvx0znA+L7O6jp3c8TLVAspqSWJ5CCFzFXLkaIo9VMvBrN4zKxeTq4SM+hC9iN0czbhL5mT8WrNH4o6/QY/UYsdpWVTfhhYyKqfxL25DOaBNH79A4ii/65p/yEFBtaF1wwazsLMbHHx5a5K8a+EEkIMNDZkAZnpqePzj2YT0LKNKlv6OGQOCRKBkCJs5tAUNlZcjH2bDtsxUuPBAAyzDoVnebrLmxRqs//JrBFf6DH9pbcVZQnkqCVmRYrG+kNezDQbV4jmBGLvr/AGT+z4XtrkPmOomNJc4aKXhOIgdTk6alPunsPlnV5sQjjUKbpe5wlOokTTekLzupzWcDu3OoAeOf65hfJoAh4V+Fv5o7OIlmfLRKuN9J4n0+O/1JcAmouNoJReX0e7EY43y+HqGZu8s3fKAPEslZagsfGPGG+ngcxEMtsiNEsnPpxoTkLRneF3gQPe7M6VVBSOvqmmksmnOSGxIAmqJdpJn1VlP0uqnIHoVBoRfSH9ynn3kklPwVZiGPP/xAnlgXAOE8yY5gYjralwbLAcrDtCbKXBLMnIWm4Px/UT+wivF/flehHQoz9dagO4hP7KtzVfsFtdSw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4Ec0YXUVw+XxkL7wCXFdR2RLtayH/r5j8Lpx5ttZ66f0kmZc5ptkbtlQFKYxWjkYlBLvOiByqHVrkiZo0LrQOZqmAHVRWFckvMg1mxslRryDDShh2o56pJ2pBYTXwVnKggIDsg11bCoElYHiF1+WPPrXoZy+V6ow+HJYPnpCEdvoXRQmYcBXVEofBidywHdFNOFdwdHjYqiyiWclQjG9wPMlQHjxWWhjjRIUwFlDAtzEWsNvI97nMc6JLBLxFZyzun1ocJls0NitFPS2AwwBAGlPRmWvHRus2Mmkt2GCbUL8Xu4lFmlMrFKa26+JR/YSfdYE9IfvAG1hBohkzVXq/bVYXC9cY7JFdKgDJZN4O3oIUzjCMpLp99T3jc6JXlcPbxW5lg9RM5N83jP6aOMMeo9MayKhjWQcKZIar7KCXtNgir/EwIaJ491CdOehEJm/eugAS11fmWatmKY8McG3HMHWWpDsfzBQYu1ry3qtrBUVA1R0MM+R5WNeCjaxkvm/o0z6SS+nw+CjuV4X9pyn79s17p4j0v3wqeHA6IMpFosnS2v/BUt55OdD1EERltcXwefawKxGlny5IU8ncklCRI5PzmhHcvV2D8cyQOmrznoe4fqFXj97wAxPCDJ/MHllU9GTcUyv4bJY05ri5tBzckl4gAJVR0LryuNIw5YZc+CbSzpmGQWdyEC1a8j1W7YUIDAiyTmlTrD/u75KZXAVd0jX96ke9HoASO3iziYegdHGAgEQ1NvF6RQVcyaow47oa6B87x2VDRNap003wL1g1hQDSOEvwiuqL0YxCdWPMbUmeWwYbLeatrp2flEC1NVxR2XcsSEQvgLMJa46UgooPuYgINWtRpskabQQsXnTrj7U8tyLoW8jFisfJcmeGs6QfYecCzPeA4DYvu9OTMCri1WSNRv2AVYUrm/T843wWR42lT6gnvFYinAgwJJd0jhrP98hpTrGJiO2JhOysy3zKRqOWAb9Q988gfz6RLnyMj9Sd5vsLlOO1bfHH3DYhcpSnkBCMTSRMuwVbKrI1juBN+nmYKwV0hfOBkUU/BITXXUf4BMo7GZtp59AFP3pa1IRhqmmQZm9V41uXlV8EuW/Xz6kP6ouzJ3CXPcwxY2Y22OQUy4EDoIHTofLyVj985Pg4nTcgmzLuFYgIlIow8j2XfAwTbCqoulSXcglYEtPKyy9IPrQSn8imibMK49jHKNQF+s3NTZ/GcPFgDE0eSl31jR3Xv2sM1KX7PqOXE9A0jgTfPqfHvprwtfIDi4Hl8g3LipXK40SxeocWoIt8OmM3PzkIPwIsv/cj0HHS+2QajQ= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c1c7a09-321b-4c5b-f05b-08da6cc96b69 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2022 16:35:57.5802 (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: HE1PR0102MB2620 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg: Zero subtitle packet padding 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: rfWAelO0Ns5q Fixes uninitialized reads in the sub-lrc-remux test. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 632ac25cb2..1089cc48c4 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1118,7 +1118,7 @@ static void do_subtitle_out(OutputFile *of, exit_program(1); } - pkt->size = subtitle_out_size; + av_shrink_packet(pkt, subtitle_out_size); pkt->pts = av_rescale_q(sub->pts, AV_TIME_BASE_Q, ost->mux_timebase); pkt->duration = av_rescale_q(sub->end_display_time, (AVRational){ 1, 1000 }, ost->mux_timebase); if (enc->codec_id == AV_CODEC_ID_DVB_SUBTITLE) {