From patchwork Fri Sep 30 17:05:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38483 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1839882pzh; Fri, 30 Sep 2022 10:06:24 -0700 (PDT) X-Google-Smtp-Source: AMsMyM41z2+al7RzfExRVvVSBMjKNHJFW6xUdJW3yTz/uXDFGYXj5vY7YO9C1taDUJXARBM1c5ti X-Received: by 2002:a17:906:db02:b0:780:24e:cf9 with SMTP id xj2-20020a170906db0200b00780024e0cf9mr7137109ejb.460.1664557584201; Fri, 30 Sep 2022 10:06:24 -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 w15-20020a170906384f00b00718d0985aa0si1758178ejc.247.2022.09.30.10.06.23; Fri, 30 Sep 2022 10:06:24 -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=rQCq+2CA; 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 7A57668BC01; Fri, 30 Sep 2022 20:06:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2035.outbound.protection.outlook.com [40.92.58.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D8F668BBDB for ; Fri, 30 Sep 2022 20:06:02 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mYMLsal7tlG0HwL6LrK4T59ZpUaDjPkDLbf2SNy4GfEp3bx5z2J1Mv/ndWA8koF54iv5ufwHILVmV6bRWgB+LksPthanqOd2Ugup631AszrqNeXIZkiHPTHAv3vmEqhkI6gdOrVfAHaClNG2IMkhnauLHBG3CbPNO60QD0eePwKBXmGkm0EciXVKEvYPn/fXkqK3aE988iwon6FxL/dTfGV26DEHkjZt0oeXJXsJWKNozU6p7jo2aq0+rQNmZfLPwHBm6wgEhXv/f7oN3Lee2tp0cUbOkU8oNb8JNTNDaAGOFT6oTLKo7O797HYJ72SRItGK+jnp92VxVgLhabXy+Q== 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=90ZDJ8Ks0MdQIfnXmikWtVcW/N7Gasd9UyVLBmdV+Mo=; b=ClezvI+182KE0I04cfeFMBTwKoQ4B78sZK6WMyE6gfsP7sNUaq3rWlLF1bbJGhKhuQLMkt5YknBizs9aiQ9JY8tENQVvsdRpMpsh6YlN68H/V1oS6d4KPDSmo/OE/2vEep3IqiZcRUov3bQJKuY7AXEPaS5oBAq8CT6jt6a4upzne0o7lEciTGeXrdiKY5s4GuRnsepoZsiy1h4xyPTiRTzmmdK+OVbETshXXDgn4EUOlyOPc5vhQP+HG+VlYKa8x1+q+G0DBF4esHS5Whzn5UyaPBKFFKfGgySjWLNj9buPhUddPqWWdxNSR+CSOy29YKsvEDYLF6J4Co8zV9HZlw== 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=90ZDJ8Ks0MdQIfnXmikWtVcW/N7Gasd9UyVLBmdV+Mo=; b=rQCq+2CAXNdwWZhndVbr0XTOVkComtt8BEVQf5+sXJjU3tSQi2uDvxO7U+Qb41rZeDtgiiO5YO3lm0BHWt0Lt9Idj691RiytkZ4AWLDHL83wvfm/eMsMQMeYVzG56JrGYJqoQfKYjRrOKAPOKYRpmpIJI6XfxCN7rQDdkt/tVnq4X64eErUhQ2LeFVjfUEvveoqN3PPWMmi7XJ2VXNHPaWGW0TTJcrx0AMYHRpkq1Fu9kxVEQ1efDuWsPIsKGgGnGl+t72dKOMa3eWGMRaD/2XpbpmDeAEVAf7yHEKt8v7PIVTrZpTUTXhblXR92w9BnYMC1PVn332ZM3A2Rac7G/Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0175.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:274::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.23; Fri, 30 Sep 2022 17:05:47 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5654.025; Fri, 30 Sep 2022 17:05:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Sep 2022 19:05:14 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [GKLmSkSq0TT08qhs9YtpZAugtV9OhRCx] X-ClientProxiedBy: FR3P281CA0040.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220930170515.3648239-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0175:EE_ X-MS-Office365-Filtering-Correlation-Id: 20ad623a-8207-4200-7c95-08daa30604ab X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrST/aUJU0/QUaXtXS9lKwzaWl64MCTP4+YBx8yKufmryrhPNGv3KdE4deaS7tW4nquZYSB1hOesOLueFRiykuowY2v0QM15cRJDzJBvIrZW1Ecs/XKF8a5Yzf7Nv+4RZhr0DF5iuBfSC3juTIU/Rl/fcBOxyRV7g4Jk8zl1h7AcZ/rrUtEMKIqpEgoQDdwdsZJa6TRf1xOwzAhKHg8rv4q4fx/qk1mN0Z9/5dDj1Uj/tCsw3W3wKOvjdTSeGHNi1r19eD6hv4bOQf6HI70la46XDNuUajR2rLboFa4S4Kc4Vbvj5PYydNrN7vhEBqF+XhTmhBMz1E5JcZdwc6QpWuf50mSTOGWbj8FqTNuE7aRg/JY3PoEHT5W4gIv9vIlL4+QdW4TPy4impN9W6ow9W9s6LbGjugljX2je+6DjUtDMT4sIuI7jLCi7lAzOVGTE22/zfLViDITM+Va/GzOZgx9yyCInO9ElAYI+DgwlJj8WuuqQ7ZMWjo20uDgHFPy13XegWiw/8zDT9L1rNt75waD3KZ5qvs5hNjWBop0xVHzgngqDgtpFzhW0yPGx0gwAN0Y9bKgGU2w0K2yrcNtNMJPPlqib7YxYyLQXxk9NB+PDUUnmSVUUOfSTN2vdrEpA9cAOgqJheRe/vYq/kMe3o0ooFDAPAPQkhErndZEiGYKfR3eqb+3WiJ05OaZDyBgWo4reFWUSKcoduI52t5zRkCFJ3HULjO5S91s7T/g26OVv4fCZtjoPD86PjN/xdCPLyU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /jFVd8lerLXeFZb/8fONG1imCA5xXaJh8uED8XQ5RWaMb63LcLAdj/u+/JFUKf78DiIyFfdZTH0M4ek7Kd7yunLqfweqZapNR8XVXTeyEVUZQ2cy8p4hQpyH94ZuLsh7WkoEo4Mzdc18UMbNaNIpfGmA340RV1mjU4jk2c2ybeMW0dYyJWqOh1OLh3PPNvHDQMMxZnTk8mNDB7qUisM0vHy+oX0kc+bUkyTp35zj+UJR7zI/GGKsA88juneQMwgyprhDx6TKkRWSNUmUHvbSMySxHh7z3gtgb/0J/OEnfbUPNZoovhH1QXuLCNxAFXWqGLJca/nOo0pyRMDr4NSTgPTg4RdqSwjT0Nu1+kf0H5IdrTzAtUkRMeHeXm80iesEAjuQbgm6xAXcrXQbx0xsH0XUwIPvWp5p1t0xjJtmPMNNNjLjQ5eel3NmBgS+DOi3OcbFDVLFJmVcYaOS4rvhPsKK/J96s52k1MXYhk8sjnMaLRz4zaZGDBATVcmez3Qpqm0apqIv/WZO3Ws9gApO50zbrtxhBQotiGCaqnd9Zv8g+X3wO7pKW1hQDHNlpEp+zRC9ANNA8oph7SADoFBwrfBeGijfptX0xIGmCb30to7VxyWtcZ79BAFIWdqQ6KnnhEzmajSxBz2l+mOi4fnSaQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yQCl3deN4q8g9De//fTO4St47RymhVrbHzRSd7R1ERFVw5piLgcb6QSxXrkOsVJQR9mM7w1QYWOSc3fQ1Sw6k43B2tP2ljQ6KR/TwJLPbKB6ieWelnT4FTu1894AfTQwmhprxTCpufg5tkyZzTSqXjKTqXP0wAFpDcqKjvavIDkIvZRxzGTQxSv/MUHdJelY1YXA+LCr1fOR2m9s+6nqaqJxk/WZGs/Sj/066mfgPA3P9MKfhTDIGFjLX70XQtKVJ4SwCetCrj8WOZ6QJCDwAVjUhIgMjUfMOfqv9In3yFXVYLcz4IfJlmo46CLraqZ7qTSWF9I0Tk3HATD26Wlc2yX8fbjwLlDvPuRQD9swSetofbyVyIURNbeEk5rDV5Xvu5HchiE5IxAyzeKMgwWv4U5F3sBo/UZUDMCpZjph3IXtSejF/zhPsMLpoTdx+ghDo3bdgZeJf9lzjT//uVKnAcYpzkEQi1CD2MndLeJ4LCEOrUXneMCJ1Vdw97kULSsC+6qPUyLEHpCaUlsHpbpZcUXGiaWuVXutetTJF2NZ4RPyUvfgeokXpoprm5mEDBkDX2mKqy7mOjhTQ8zfAIW4cCDhKlL8A5ZZlcAmeriuipum1g/7MM0bPxwWkQKnnMgtgUTLrs8U9L4YtJ/SeraVn7KQmVPEu+aV9NCFrIs/WZRX/q4g+Qzyy1zt0kC5+GmX5QejogzjD0JlEiFya22Dg9QGEQF6PvLHbszUAVchhftKJdwygAYGl4Od7zqmt5nXwiQ+iRZGidwMi9RgCXE6xVkDCQFrn+weWCFdrgm9hnjo8HJ/SiGsxCRYKaJHQVeumBEmY9J0tZan93r6Qpefi6xO2ZN8A/Oc+CdM0VSZ7ZybibJifCDn7/D49MwucPqfy8MnVSWOJ2sDtYm7eHeFS9VvhSGOYMg0za7McIWmqbD81zHa0Ks4hfff8EjPVpVlXuFjg3rR2/RPhS3+aULIjSTNkAybci0ILm/vKeZ3oVl0iFHYlQfqzAAAoIpENNIIldZIHJocBQ65IqeLg2kLwl8r9rpPpJ2h9ZSflADHoCcj0QMuxcAbfpAVHST4oV1GO8cBtAECl1V5WG1EuTs9QaMhP71Pj87wXmRWdHSqbP7Jv4tEr7UPpy06KVeXsn+JR9tgvpZOivBOf9Fgsl+14UX0Fvsa66LBA0n427ug8o+ZEHuirrfCwtuamCozSKN5R0DYfZIfa8U/zaTY8z9dz3oFHPvsRsiHj/qvpiZO1qgitNOrLZzTHOuhNlzRCEWf0s2E69Q5mU7qULte1hAxvfaGXf5v9HS3RcynIudPG88= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20ad623a-8207-4200-7c95-08daa30604ab X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2022 17:05:47.2259 (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: DU2P250MB0175 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/escape124: Fix segfault with negative linesizes 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: JJjwPs4WnBlm Use ptrdiff_t instead of unsigned for linesizes. Fixes the armovie-escape124 FATE test with negative linesizes. Signed-off-by: Andreas Rheinhardt --- libavcodec/escape124.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index eeeb9bb0f7..024eec59ce 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -178,8 +178,8 @@ static void insert_mb_into_sb(SuperBlock* sb, MacroBlock mb, unsigned index) { dst[4] = mb.pixels32[1]; } -static void copy_superblock(uint16_t* dest, unsigned dest_stride, - uint16_t* src, unsigned src_stride) +static void copy_superblock(uint16_t* dest, ptrdiff_t dest_stride, + uint16_t* src, ptrdiff_t src_stride) { unsigned y; if (src) @@ -211,7 +211,7 @@ static int escape124_decode_frame(AVCodecContext *avctx, AVFrame *frame, superblocks_per_row = avctx->width / 8, skip = -1; uint16_t* old_frame_data, *new_frame_data; - unsigned old_stride, new_stride; + ptrdiff_t old_stride, new_stride; int ret;