From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 89ECB4E3E1 for ; Wed, 21 Jan 2026 01:52:30 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'jlmVVmx0npNCEQXDDoRkz4e+I7d6bT4ggyLEyn4SgEk=', expected b'scByts2v0Pv3Vupee/OUXB7ByfjzK/X9UKtrQKmnrx4=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1768960340; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=jlmVVmx0npNCEQXDDoRkz4e+I7d6bT4ggyLEyn4SgEk=; b=eNL5hqK6XRqDe+HKoXsyxtcUgmOlOroXDBa2hnf9j/CR9ltZEDBM47pAP643fDYoJqOY2 /m+yBxQpCvx6+22NZakG12j6eB0C3kLqMkD20twYoT8pNtjuJXVZ96SMXCIGTUSE9FhBWer nx/CZ/jiHPB++1rERnPxGPjEpvJjqQlmHs/gfHLi/SJ+b0vF4Me6eK7Qay/nS+hg/MkZwQV NFSeche/AZkyIdFt83/b6OINzHmlrDnRH2K9k1qTW5+y0wV9cCRX1jhcEfCN0Jaoa8RJsNT uTgD/BPj42ydnXKbCd+gQUVrCPaWVNvPjixmZ66ETnyga7UJuiM5dmU6dTag== Received: from [172.20.0.4] (unknown [172.20.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 8B550690EBF; Wed, 21 Jan 2026 03:52:20 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1768960317; b=KMJtIHxGAH9EOjFurOQap9wK3x1pTClI8OUdkrdFkkPvUoRx6t6G6lfQI1yFUyiOHeZSW 5/PpcuEmqwnEbx0Qx8vplw7fadOyuj6uHEiAPrdov6oebaxxETGCPFhRPdRIdd/DOnK2V+v A3DE7S7O/vHJxQvcDHxeYz9SVVBBXyQ9NLBWLtZXtzN3LGVAsQPVDkiY2HMAvCIt0ltQk2g 3LzW0elLaFc35k1doLv7C29Pv/rYNVxYddLMKAQQnjVe6Pu46DLtQFcg13N8RLHTiEX76qs eyM7Y6ft5sI1xVY6C3/BVNWWXezP12MCFsYr2eF4cSgfL4O8oR/SPh6dM9/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1768960317; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=xPsRqQkXRmQwt8DsasaBm/j/R3skEDUBXFki7t/RHDY=; b=Sx+Q3i2qSNmGOCkBKC3hhMRwOAZIWGMLfRulDkLbmvKjwI9evCm4apJDz6hLFbcQXMhG1 KyEJUAlzZONS1MADmmtse/j+7Gkz+Tm2m5U9+DxhYzH5i8zy+n4fFj5EtNnI7HyjopSS/pu GidHRwLYwcm8jaZStNnJcHOCOhJA+MdwMN8sYYFEtF865REWgr55L+fOGpF6j8ROV45HqmH zaKjqsNRtdXnUeuUf5VfLU3TEjF2BPw2LyYHhntZRtUHv1VSc1SMC7XYccjogXCZc5huHSb 1Y+P3DlpsmFF2EOcjeuhqV30oIIaomcM7e99qSwyDOwfJGIxf0HknkJB59zA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1768960308; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=scByts2v0Pv3Vupee/OUXB7ByfjzK/X9UKtrQKmnrx4=; b=NGjpowClRHd8CJDUHVGF9aR2dAemlYhnbmdYTBu92cw7dpzkhEjqDY6pcGJKPMSqhSQ13 Hy3CjARUYvBulGQRIY3JqETGwFYDhhR4tZ8iAHU9KDK9ax9XlNOOwEJlaDbNFUL5RNjGjkc l55n0AHG2ZAkQ84FJ1CplRKnm6gkN8lo9yi9WUbIfgI3XFZ0wNy43Qv9wyWQu3Enlndfkj8 IcGpP+RRyugYuUUayRzBN+tN8DjSXxyHDZlTtGphHhk8+L17dg9EkXdSxHfiffn0ebsPL1i KhyTvC1xGaUWG/KZmldDAKsfb3FynE42qWV+YqhH9SopdSueQN2kfsMWk+uw== Received: from 69dab402ede7 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 9FB3A690E37 for ; Wed, 21 Jan 2026 03:51:48 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Jan 2026 01:51:48 -0000 Message-ID: <176896030877.25.15431400490459686392@4457048688e7> Message-ID-Hash: QKP4C6ED5FPUIDTSCFVP5HQ54OWHLDN2 X-Message-ID-Hash: QKP4C6ED5FPUIDTSCFVP5HQ54OWHLDN2 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PR] avcodec/mpegvideo_enc: Restructure ff_h263_encode_gob_header() relation to update_mb_info() (PR #21537) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: michaelni via ffmpeg-devel Cc: michaelni Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21537 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21537 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21537.patch Fixes: out of array access Found-by: Zhenpeng (Leo) Lin from depthfirst Signed-off-by: Michael Niedermayer >>From 02b52593d6a6498cc967904c6faa6477c0682a16 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 21 Jan 2026 02:31:51 +0100 Subject: [PATCH] avcodec/mpegvideo_enc: Restructure ff_h263_encode_gob_header() relation to update_mb_info() Fixes: out of array access Found-by: Zhenpeng (Leo) Lin from depthfirst Signed-off-by: Michael Niedermayer --- libavcodec/mpegvideo_enc.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index a4f78c25db..1714d3b6db 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2925,7 +2925,7 @@ static void write_mb_info(MPVEncContext *const s) bytestream_put_byte(&ptr, 0); /* vmv2 */ } -static void update_mb_info(MPVEncContext *const s, int startcode) +static void update_mb_info(MPVEncContext *const s) { if (!s->mb_info) return; @@ -2933,14 +2933,6 @@ static void update_mb_info(MPVEncContext *const s, int startcode) s->mb_info_size += 12; s->prev_mb_info = s->last_mb_info; } - if (startcode) { - s->prev_mb_info = put_bytes_count(&s->pb, 0); - /* This might have incremented mb_info_size above, and we return without - * actually writing any info into that slot yet. But in that case, - * this will be called again at the start of the after writing the - * start code, actually writing the mb info. */ - return; - } s->last_mb_info = put_bytes_count(&s->pb, 0); if (!s->mb_info_size) @@ -3154,8 +3146,11 @@ static int encode_thread(AVCodecContext *c, void *arg){ #endif case AV_CODEC_ID_H263: if (CONFIG_H263_ENCODER) { - update_mb_info(s, 1); + if (s->mb_info && put_bytes_count(&s->pb, 0) - s->prev_mb_info >= s->mb_info) + s->mb_info_size += 12; + ff_h263_encode_gob_header(s, mb_y); + s->prev_mb_info = put_bits_count(&s->pb)/8; } break; } @@ -3180,7 +3175,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ s->c.mb_skipped = 0; s->dquant=0; //only for QP_RD - update_mb_info(s, 0); + update_mb_info(s); if (mb_type & (mb_type-1) || (s->mpv_flags & FF_MPV_FLAG_QP_RD)) { // more than 1 MB type possible or FF_MPV_FLAG_QP_RD int next_block=0; -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org