From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id B39E14D817
for <ffmpegdev@gitmailbox.com>; Sun, 20 Apr 2025 16:31:47 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE6C9687DAD;
Sun, 20 Apr 2025 19:31:45 +0300 (EEST)
Received: from EUR05-AM6-obe.outbound.protection.outlook.com
(mail-am6eur05olkn2013.outbound.protection.outlook.com [40.92.91.13])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 523B1687BE3
for <ffmpeg-devel@ffmpeg.org>; Sun, 20 Apr 2025 19:31:39 +0300 (EEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=jniFsGqtr3Kf3yrRZ2l/WzCFRqw1GqQik5oDySD3JN0G5TBugxXgvnASWreFmjPtbOOlGDjMlVASxBcNIKduAyYZBA0o8FHGKk/aM9+9qOUpAcdClTNZINqQa4XXTZ6vnLGyUjVAaVAzaqOT14K7WIBvVpNDOOPsXCInmUA7O8L4vS1nioiNtLE1qOHtXzK3NIiKyGcfUDWKBtWfZGQS3doEFijFbx1uOoiDY5dlLHKliATwvD1otj1ulkTs8bOvKOZAuYvuLFvQxSXs8aYXBzDvfFlYPLqqKBeRjmK6C5tDIEDzMdYA78hZsLtZy3zWVKf0VsesbmIGaqVB0nQhTw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector10001;
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=gIF283Dbl7X5Sp3uY56CbXBZfHMxotGxZq45RjBE+i4=;
b=oTajM8+jWP2nHUPeOjogO2YI+llzpU4U6gQKDZfd15D1KbsjVlVp4LPpS1GO/uYMSOSk/ZDzqNG4sMyamyjNb3tQ/MSxkKef6IEkvt7cJtAASs4OzfjGIxWLK0bhoQrt10JJGxDHzgMMby7Q9Oa4vK0oMu5UZTnxOhX5fOiCegfLLyj1PPEVOK9eu96+Ftyyiul/2GRQPymWz5JKGdNbHQBe2v9F3Y0roPT3zCiuj9JX4YqjgU+taBV+Oq7920x/exGybwfS4Y94h7iVWSG8vlWKbntlTprH9gKlGxxPFO9pr5vHGiYJEIVOIC9g0krV3m3utjRThxuNm2+pmm3yiw==
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=gIF283Dbl7X5Sp3uY56CbXBZfHMxotGxZq45RjBE+i4=;
b=ZXazGQaZuUKtJETVKclTtlNqCj9yUQzKMbyVYqM096pzno5OYOiKp+dqcdmsqvvDfQxMSXfgGxBQoRl4meFGtHsDOBPjIu/9+8R8zZgkLK+8OXtrWsKq6Or9nOPOxUXzXk+i5ykA09KZ3FgE3ZAGSIixsKuybLT+501pQSucx81Cke+RvHlxm1vX1NQ6vNPv/pIYo5jxUQpveWTK7Ht1CJy6ImXL9SrA3qnbXF+Be9oTW+X7WQ2yZ/hmCgi/dYyh6Yu2HsZhIYCzoRieE0/FtMs1Rx4cuW7rg9xv3XJ6EwcCDltzw7Vo9f6KjuFscnGGibnl38ZzV7htyJNiG/rL+g==
Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17)
by PR3P250MB0324.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17f::13) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr
2025 16:31:37 +0000
Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
([fe80::d6a1:e3af:a5f1:b614%5]) with mapi id 15.20.8655.030; Sun, 20 Apr 2025
16:31:37 +0000
Message-ID: <GV1P250MB07370ECFCE27705129BD56738FB92@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM>
Date: Sun, 20 Apr 2025 18:31:35 +0200
User-Agent: Mozilla Thunderbird
To: ffmpeg-devel@ffmpeg.org
References: <20250130015722.2069524-1-michael@niedermayer.cc>
Content-Language: en-US
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
In-Reply-To: <20250130015722.2069524-1-michael@niedermayer.cc>
X-ClientProxiedBy: FR4P281CA0104.DEUP281.PROD.OUTLOOK.COM
(2603:10a6:d10:cb::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
(2603:10a6:150:8e::17)
X-Microsoft-Original-Message-ID: <e8bedc03-1abb-499b-8f58-d36f54ce6c14@outlook.com>
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0324:EE_
X-MS-Office365-Filtering-Correlation-Id: e209647c-c3ae-4c93-b9d8-08dd8028d1e6
X-Microsoft-Antispam: BCL:0;
ARA:14566002|7092599003|5072599009|19110799003|8060799006|15080799006|6090799003|461199028|3412199025|440099028|41001999003;
X-Microsoft-Antispam-Message-Info: =?utf-8?B?OTNlT01scmJsSUp1VS82NloyY2pCSUVVSTNyd2xRTWdPdEJFWWxqUjc0V2pk?=
=?utf-8?B?bXhmR2h0NVJYcXBvQVdGRXBkZkNxUzlicFlOMjdhdzlBMDEya1p6NDRXWUtH?=
=?utf-8?B?aS9FVm1WblFJbkY5Qmk4WVNIM1Mvdk92MWcxaVVjaXpMOHNaM250VElXYnNt?=
=?utf-8?B?OTBNeE1pQ2Nxb2FiWHpQbnFxRE94SVpEcXV0bmtzUzNySmlqQUtDUzFraGti?=
=?utf-8?B?WTZZZEJOL2lFLzR2UStZQTVCU1pvL2YyRTNZTHZVZXJ2c2o3UVJUR1ZOd0cz?=
=?utf-8?B?ZWxYRlcyRTUzMjJaQTByZUdiVDRJWmFmTk50a0dDWFFSSEtQUDJtdlVJNkJx?=
=?utf-8?B?UUpGZXVFYUpyZlltckZFejFERmpQamsvTDBjdTlwWHo2ZWUra1o2bUcvcnV5?=
=?utf-8?B?bjNxQ0Q2NEVaNE5Qa3lXdElVd3VpWHBXM1NkMjFBM3ZKRlhHdkQ1ZTg5WGcy?=
=?utf-8?B?OE1wdFI3L1VHTnFPY3d5NGFYVXI3UWFMb0JhbXB6c2dNbTE3VGxJU2tBZVZP?=
=?utf-8?B?MGhPT3JpMkRqckZGRVNZRGVPejBhYmd2Umpsd0pCWXVZMkZXeEUvOXJybHpN?=
=?utf-8?B?YzlrRTZJSGE0cnVBb1RiRWRBdlArTk55RXl6ZzEyTnBJTXZMZTRPaWJyYmtn?=
=?utf-8?B?N1d3aWpjQmtFVXBqaG5PREpEV0VYTXlua3kvNk9Hb3ppZ0pzQ21zMW1jZXhv?=
=?utf-8?B?VFQ5UVpNN1VRVWk5aHl3WDM3eDJpTURYWDREZ25QeTdNeXFBQlowQkFob3lC?=
=?utf-8?B?N3IwdXU1elNURm44Y1JUR2k4VUxpdW5SSnJyaFdsRUwrc2dDZWJSRlE5NGx4?=
=?utf-8?B?c0FxTllCdHAyaE96TG9GWHZBREp3UXFCYjc3dmdPUk42aEVNQXMvdm1SYStu?=
=?utf-8?B?bSsxcm9oN0tKbnQrOWZuTVZpZitIWEl3MWUvUDlGY2lkUlIzNlQ3V2R5SVFD?=
=?utf-8?B?clUwQ013REhxbWJjYmI5dlJ5eW9HbHlTcFdSbDgvaE5HT2tEK2hvZVFwVDhz?=
=?utf-8?B?a1Fhak9kV1JNY2p3bDJFQ3J4d0xibW91RkUrMXg2NlhnRy93VVdWaE1DTVFG?=
=?utf-8?B?L0tKNEFBVzg3ZGRCaHNYc2ZOQm50djZySExGWmZqMmJRVWNmN2pNMWFnYzF6?=
=?utf-8?B?ZTEwUFdsdFFZSURiZE41Zk9qREljUjJHanhEaGFwMHptVmQ1aEo2ODRrY2Fq?=
=?utf-8?B?SFpKYnp3TGFNaTJ1Z3B2OWlUMHdzWVVHUEd5bXJlOXBmSTNOalFsNVdncjBE?=
=?utf-8?B?M0RQWElwbk0wVHFqTVFKajgxVjREVlFYNlFrZGc1VEtJMGo1OWRsRlBwYUxt?=
=?utf-8?B?VkRrdnhoMjR4NUZna05rS2h2dWd0alpkeDVjZU1kZmxzTnQ3ZnpFYjZVcElv?=
=?utf-8?B?MkQwemYxU0hjVU9vSXdtMWt3ekt6TUJRSmNJcFltYmhFYVN2V0tJdy9LelhB?=
=?utf-8?B?QzZJamp3cHVvd2JEUVVwaHY4eitHSkpwUTQ5UE5wa0RIK3Z3b203QVpKMzFy?=
=?utf-8?B?WDUwSlpVU3RJbGg5Kzl6U0diYzBJYURPL1BOaGVpekJhRVVXY1lvb0dzQ3Fs?=
=?utf-8?Q?jW6Ralcn2AKUCRo0uyPGYUQZo=3D?=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?V2hJcHdFbHVaUTF3MGloemVCVitlY1U0Z0tmNXFJTVR4RUc5VmJpWWFXMFo4?=
=?utf-8?B?ald5MWxRRnVjZ3pUdVF6WTdIWmQzMjI4d1lqZ1NBS1FiNWFXbTEvcTRFMTVk?=
=?utf-8?B?aEVsenljRUd6N2UySHJzMmpaL2UrSjNKNHppSzFvOS9SVlJvcSs5N2pLbU9M?=
=?utf-8?B?RlVGdXJkYlBFVmhBNWtJbUVMVGZBR2VjaWRhRHp2dTV1STdaMmIxZVV5TDZT?=
=?utf-8?B?ZXlwajJvcmxEN1NmWGkra1NrUWlMUXdQWi9GSkFoSkxnVGtXeXkvdVlXbldI?=
=?utf-8?B?c0E5MzBQU2toWGNnWGdFTnJOVzRBNXQzSDBObUFxV3hJd0d6R1F3NExNU2NC?=
=?utf-8?B?djIwR0Vyayt1RkZKSVRTbFlpem9HNFh0TjlJOTJ4VWdVeWIxYlpmRUcvby82?=
=?utf-8?B?M0FyT3RXNEtNQVZYNnlML1Z5Ry9LbkJoc2Q4TFdrWXo3YTNpZStEU1hZakVW?=
=?utf-8?B?Q0tJd2pWUTU0UERmb2hiMStFbFl2ckcwaktmOTk3Y3NSNHFKZDY4RHFad3lE?=
=?utf-8?B?M1lrR1Z0V0RsbG9xc1Axc3hKM1VyVXQwaHJ5UTNnbkJCdlFJVjJwTHZqMXRl?=
=?utf-8?B?U2E2UmJkbHRtRGdVUFNhLzZqeVFoYmxYTEtpMmdpZ3NJY3V1OHN2L2Z0S2hS?=
=?utf-8?B?RVFRdzRyRXdsdXhFRXdoYTBHbnhBSVZuRGcwNmhJaHM5QTludVN3ZER4M3lZ?=
=?utf-8?B?Q2hWTUJ2aVRjV01ZSFVtWnEwSEJFa3h6dklON1JzRDNhQ1lMTHVHRjNqK0tZ?=
=?utf-8?B?cSs5TGtMbmZjdFZtdzBIQWZTbWs5MUxqVWpMclVIZmtwdWhwZGhxbFFGS214?=
=?utf-8?B?L1VHUFFld284Z0hoK21ZcTJjbTA4WE00UUFTK0tBNldpSWU4SFdqQjg2YWZh?=
=?utf-8?B?YXVOZFVTRVdkcUNXb2s5VkM0ZXJKT1FPcTZXZDNzSWRwZEl0NWFEeWlKMU56?=
=?utf-8?B?eG9GM3BRYUtqL1B6UklXN2ZkM09MOXhlc1dtNm0zRUo5Z3BZeUVEeEF0Y0RV?=
=?utf-8?B?OGRkcEpEMmhRYTJycmQzekx3bXZvNzQ2YTV5cnAvMHBXdHZqZ3BqQ3ZiR2xm?=
=?utf-8?B?RUJlTVlUWUJHdmNxejdHZXZzWVZIM0VJenFFaVFwK1BjVmFOcXJrL2dPWW5N?=
=?utf-8?B?MzBBMFRERElkc2FSVlVIZ0d6Z01XS2wwMk5ubjNjYW8zMWRSVVJDNmZ4M0NM?=
=?utf-8?B?MG9wYzBFeHFSREZFaXdkbGtBVzRhZFdXM3R1bWVUU0ZuZitxZzZTdnNPSjhy?=
=?utf-8?B?cS9PUUlLQTBFLzBRY04yNUdpRi9SRW9IR2p2dExJT2dNQ0tyaGhDSmc0Q2Iv?=
=?utf-8?B?NHNDMlRmdlRMQ1VRWnVwMmJwNVM4RGdyQ3hjcE1SRlh3Y3RlWU1UNUV6OVkr?=
=?utf-8?B?NVVqN3p1TU9IT3htRmI5SVJibTlzWkRkYzVMaXhUbE56MFo0Q2VEeFhFeGZN?=
=?utf-8?B?b1lMNDh5Q09pOFZpSmVwVzhZY0o0MEd5VVY0UzROWnlkY3FXdUZRL3NZMlhn?=
=?utf-8?B?TDB2ME5JZ2haN3ZXUTk3RzdrQUkyak85aldxRWNkL0ZnTTV1d3Zpa3NKWUk0?=
=?utf-8?B?K25xT1QxeFFKc21VcXRxeGp6dzU1ODJIZ1Rwb2sxclVjOG83ek5ma3JmVE8z?=
=?utf-8?B?VzZQRXNnTjdlYVVUZG5BbEc0d1E0UnZQN3BpUU5UbE05WWNBZmg3OWttbHF6?=
=?utf-8?B?Qi8relRBaWk0YTMzbm9ENlFGTWh4U3dKY3VQY2NCS0FZb2d5NDFJampLdk1B?=
=?utf-8?B?NnByZDhEb3l4LzkvM25TUGQzRGxoWVhZOS9lVWp1bEpBV3FVYUZXU1lUMTdD?=
=?utf-8?B?ZTBxL0xMek9DNHdMMzBqUT09?=
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e209647c-c3ae-4c93-b9d8-08dd8028d1e6
X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 16:31:36.8980 (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: PR3P250MB0324
Subject: Re: [FFmpeg-devel] [PATCH] avcodec/h263dec: Check against previous
dimensions instead of coded
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/GV1P250MB07370ECFCE27705129BD56738FB92@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Michael Niedermayer:
> Fixes: out of array access
> Fixes: crash-a41ef3db699013f669b076f02f36942925f5a98c
>
> Found-by: Kacper Michajlow <kasper93@gmail.com>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
> libavcodec/h263dec.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
> index 0c23012584e..5eefdc4602b 100644
> --- a/libavcodec/h263dec.c
> +++ b/libavcodec/h263dec.c
> @@ -431,6 +431,7 @@ int ff_h263_decode_frame(AVCodecContext *avctx, AVFrame *pict,
> MpegEncContext *s = avctx->priv_data;
> int ret;
> int slice_ret = 0;
> + int bak_width, bak_height;
>
> /* no supplementary picture */
> if (buf_size == 0) {
> @@ -482,6 +483,9 @@ retry:
> if (ret < 0)
> return ret;
>
> + bak_width = s->width;
> + bak_height = s->height;
> +
> /* let's go :-) */
> if (CONFIG_WMV2_DECODER && s->msmpeg4_version == MSMP4_WMV2) {
> ret = ff_wmv2_decode_picture_header(s);
> @@ -501,11 +505,12 @@ retry:
> }
>
> if (ret < 0 || ret == FRAME_SKIPPED) {
> - if ( s->width != avctx->coded_width
> - || s->height != avctx->coded_height) {
> + if ( s->width != bak_width
> + || s->height != bak_height) {
> av_log(s->avctx, AV_LOG_WARNING, "Reverting picture dimensions change due to header decoding failure\n");
> - s->width = avctx->coded_width;
> - s->height= avctx->coded_height;
> + s->width = bak_width;
> + s->height= bak_height;
> +
> }
> }
> if (ret == FRAME_SKIPPED)
Can I have the testcase?
- 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".