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 5F1404E56F for ; Mon, 23 Feb 2026 21:58:10 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'+gkz1PwYLkW7GGUEcKC1FCf5EF3HVCjEkq1MhhQ+DDg=', expected b'KL+ePnnbzGMHM3XVaTYuTan4pEGc8ASPobngaXIJWjk=')) 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=1771880452; 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=+gkz1PwYLkW7GGUEcKC1FCf5EF3HVCjEkq1MhhQ+DDg=; b=WSYXJC+QwJVd7/PQa8BUHbkrJnmyoJzf/TO7UhV7C0TpDcRYDQdmaVzKgsmYM7wXBWdqC xjSeQBESMHj59nOwhFz97391fG499ScmgiHSqk63tmQCUih1GLboAWkga1OtVVSXOTDgF9c PKEHBZSIajMTvmqPMEV0+j13ZUR7m/y8mcN3T43bmZQIwlt6RFQkx0jaNcX5OWpvOAr/86j 1+Y6+XHKtxnDbpzfco+6vPTvBF583iXg6Jil1763Rs76h/eiOHfG3qNt1dyfPSOULDSk7pn eT3GfPaWiZxTbMGj4VWZK+ftQ4tQEGU1gi8FVMPyccLPaN1MmkJQQJtCbNwQ== Received: from [172.18.0.3] (unknown [172.18.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 5AD0B691292; Mon, 23 Feb 2026 23:00:52 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1771880438; b=ZyGQZcua/9p9kzUg9yuSGZ5cmTEg6hiFFgdAVo1bjlc2knwmy3Xg+ePWJoyTtjZTZ+S0W 48nuRGdItvfEQwX5tlue1cUh+uPops6FnOgQk6E1ZYVJt/zDFkZUQi1e/NAXOKSYxiZ+AKq 1m6p9IcXXb68SLc5qMYeLpyisdW+7bzHIYkPAKhbE4/cogHLYLj9ku0fbYpx5mFDCr5+mIZ kbxTpezvEgZUmlQ+s2/MCshFnnNOdJpspoQuooO46VKgaETWPjCAok3YM9/k7xcADCTMdfc 8r5ooflu2qXOBMv7mHDNseSoUVBMp8ORauLC6BFi5OeugQGTUucJzPMCWEUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1771880438; 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=xeI3o/whV4H22zn+9tn+gsDL0k/n4Y9Z5dl04sFia6Q=; b=m+bXsgwiPxqeWObaT32UqvhcO/eVbRr46B1/dazO+NPLXKr0AK2ZqhR4yxM9KXtoLphU3 nAjwlPJHT5utxx7P6SN8AFXT4Cq9bvtJaJTiPMeLyvWBpM4/WyibH2cp/x6Fbn2WmP2eLHJ vLD0BmObG9BrT1ZPavjaEJVTf+s7vwSexQcujv41IgKYObSaHaP+DpoIEfg8/GOwQGfNT3B fTgTK4IQXWEtxmnEFIeixxrkOPEdiv6QTsWTHC3VOWVN1KJ5U12VX57s7PbxBoDoEfb5B/2 8Y/cEwfOZqB+rY73VXcYKtBVtNeZxqnX+dmGWI7vfRszRWRnJSP3zG4SUFGw== 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=1771880425; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=KL+ePnnbzGMHM3XVaTYuTan4pEGc8ASPobngaXIJWjk=; b=yC926Z+TMXangSu1sfHw95f8HKT0PCtJqWGrmo47CQ04TZ/y36H4nNO5+z0KjdrgEhysx 690Yp+XYlTUg+FwE//W0/vtvy9cCzge8eS+pXVLgcit5z7tPTQ3B6A15tVJsaoy+ig/Mn69 Z3dvr4vXZeAeeq6esNNMy2tuzYu07FbPGChyHaEg8HcJpU/d0arXVjsmT+8Rz6CuGBkDLFp PusDsler8vyWw9I3iYdvWtGC7uAcLkumRayE19oGGk/fxoN52J0yMnDkBES/+rkcrttW0vc meTcGa00QzzrEhus5SHVcfXeFD4VobZ3z/QHH/B/tznbnG8nmaBJpPfkhK3Q== MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Feb 2026 21:00:24 -0000 Message-ID: <177188042513.25.12766525317092297789@29965ddac10e> Message-ID-Hash: X2YSUJCMWZR6PLA7C57WVTPL4C2YKMEU X-Message-ID-Hash: X2YSUJCMWZR6PLA7C57WVTPL4C2YKMEU 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] ff-tmp-hevc-windows (PR #22268) 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 #22268 opened by michaelni URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22268 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22268.patch >>From a0c63363fef06d46459f2c073b1ab3949a9e1d32 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 22 Feb 2026 21:50:37 +0100 Subject: [PATCH 1/2] avcodec/hevc/ps: Factor window reading out Signed-off-by: Michael Niedermayer --- libavcodec/hevc/ps.c | 49 ++++++++++++++++++++++++-------------------- libavcodec/hevc/ps.h | 5 +---- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/libavcodec/hevc/ps.c b/libavcodec/hevc/ps.c index 46b38564d5..3606e9c29f 100644 --- a/libavcodec/hevc/ps.c +++ b/libavcodec/hevc/ps.c @@ -62,6 +62,22 @@ static const uint8_t hevc_sub_height_c[] = { 1, 2, 1, 1 }; +static int read_window(HEVCWindow *window, GetBitContext *gb, int chroma_format_idc, int w, int h) +{ + int64_t vert_mult = hevc_sub_height_c[chroma_format_idc]; + int64_t horiz_mult = hevc_sub_width_c [chroma_format_idc]; + int64_t left = get_ue_golomb_long(gb) * horiz_mult; + int64_t right = get_ue_golomb_long(gb) * horiz_mult; + int64_t top = get_ue_golomb_long(gb) * vert_mult; + int64_t bottom = get_ue_golomb_long(gb) * vert_mult; + + window->left_offset = left; + window->right_offset = right; + window->top_offset = top; + window->bottom_offset = bottom; + return 0; +} + static void remove_sps(HEVCParamSets *s, int id) { int i; @@ -702,12 +718,9 @@ static int decode_vps_ext(GetBitContext *gb, AVCodecContext *avctx, HEVCVPS *vps } if (get_bits1(gb) /* conformance_window_vps_flag */) { - int vert_mult = hevc_sub_height_c[vps->rep_format.chroma_format_idc]; - int horiz_mult = hevc_sub_width_c[vps->rep_format.chroma_format_idc]; - vps->rep_format.conf_win_left_offset = get_ue_golomb(gb) * horiz_mult; - vps->rep_format.conf_win_right_offset = get_ue_golomb(gb) * horiz_mult; - vps->rep_format.conf_win_top_offset = get_ue_golomb(gb) * vert_mult; - vps->rep_format.conf_win_bottom_offset = get_ue_golomb(gb) * vert_mult; + int ret = read_window(&vps->rep_format.conf_win, gb, vps->rep_format.chroma_format_idc, vps->rep_format.pic_width_in_luma_samples, vps->rep_format.pic_height_in_luma_samples); + if (ret < 0) + return ret; } vps->max_one_active_ref_layer = get_bits1(gb); @@ -962,12 +975,7 @@ static void decode_vui(GetBitContext *gb, AVCodecContext *avctx, vui->default_display_window_flag = get_bits1(gb); if (vui->default_display_window_flag) { - int vert_mult = hevc_sub_height_c[sps->chroma_format_idc]; - int horiz_mult = hevc_sub_width_c[sps->chroma_format_idc]; - vui->def_disp_win.left_offset = get_ue_golomb_long(gb) * horiz_mult; - vui->def_disp_win.right_offset = get_ue_golomb_long(gb) * horiz_mult; - vui->def_disp_win.top_offset = get_ue_golomb_long(gb) * vert_mult; - vui->def_disp_win.bottom_offset = get_ue_golomb_long(gb) * vert_mult; + read_window(&vui->def_disp_win, gb, sps->chroma_format_idc, sps->width, sps->height); if (apply_defdispwin && avctx->flags2 & AV_CODEC_FLAG2_IGNORE_CROP) { @@ -1281,10 +1289,10 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, sps->width = rf->pic_width_in_luma_samples; sps->height = rf->pic_height_in_luma_samples; - sps->pic_conf_win.left_offset = rf->conf_win_left_offset; - sps->pic_conf_win.right_offset = rf->conf_win_right_offset; - sps->pic_conf_win.top_offset = rf->conf_win_top_offset; - sps->pic_conf_win.bottom_offset = rf->conf_win_bottom_offset; + sps->pic_conf_win.left_offset = rf->conf_win.left_offset; + sps->pic_conf_win.right_offset = rf->conf_win.right_offset; + sps->pic_conf_win.top_offset = rf->conf_win.top_offset; + sps->pic_conf_win.bottom_offset = rf->conf_win.bottom_offset; } else { sps->chroma_format_idc = get_ue_golomb_long(gb); @@ -1307,12 +1315,9 @@ int ff_hevc_parse_sps(HEVCSPS *sps, GetBitContext *gb, unsigned int *sps_id, sps->conformance_window = get_bits1(gb); if (sps->conformance_window) { - int vert_mult = hevc_sub_height_c[sps->chroma_format_idc]; - int horiz_mult = hevc_sub_width_c[sps->chroma_format_idc]; - sps->pic_conf_win.left_offset = get_ue_golomb_long(gb) * horiz_mult; - sps->pic_conf_win.right_offset = get_ue_golomb_long(gb) * horiz_mult; - sps->pic_conf_win.top_offset = get_ue_golomb_long(gb) * vert_mult; - sps->pic_conf_win.bottom_offset = get_ue_golomb_long(gb) * vert_mult; + ret = read_window(&sps->pic_conf_win, gb, sps->chroma_format_idc, sps->width, sps->height); + if (ret < 0) + return ret; if (avctx->flags2 & AV_CODEC_FLAG2_IGNORE_CROP) { av_log(avctx, AV_LOG_DEBUG, diff --git a/libavcodec/hevc/ps.h b/libavcodec/hevc/ps.h index d620887b8e..f5c5f81a6e 100644 --- a/libavcodec/hevc/ps.h +++ b/libavcodec/hevc/ps.h @@ -162,10 +162,7 @@ typedef struct RepFormat { uint8_t separate_colour_plane_flag; uint8_t bit_depth_luma; ///< bit_depth_vps_luma_minus8 + 8 uint8_t bit_depth_chroma; ///< bit_depth_vps_chroma_minus8 + 8 - uint16_t conf_win_left_offset; - uint16_t conf_win_right_offset; - uint16_t conf_win_top_offset; - uint16_t conf_win_bottom_offset; + HEVCWindow conf_win; } RepFormat; typedef struct HEVCVPS { -- 2.52.0 >>From 50f997d32fbd6cc9a61121ca0c1991f270bcb79d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 22 Feb 2026 21:51:01 +0100 Subject: [PATCH 2/2] avcodec/hevc/ps: Check window parameters Fixes: signed integer overflow: -1094995529 * 2 cannot be represented in type 'int' Fixes: 484567435/clusterfuzz-testcase-minimized-ffmpeg_dem_HXVS_fuzzer-5628836988649472 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevc/ps.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/hevc/ps.c b/libavcodec/hevc/ps.c index 3606e9c29f..cc32043d12 100644 --- a/libavcodec/hevc/ps.c +++ b/libavcodec/hevc/ps.c @@ -71,6 +71,13 @@ static int read_window(HEVCWindow *window, GetBitContext *gb, int chroma_format_ int64_t top = get_ue_golomb_long(gb) * vert_mult; int64_t bottom = get_ue_golomb_long(gb) * vert_mult; + if (left < 0 || right < 0 || top < 0 || bottom < 0 || + w <= left + right || + h <= top + bottom) { + memset(window, 0, sizeof(*window)); + return AVERROR_INVALIDDATA; + } + window->left_offset = left; window->right_offset = right; window->top_offset = top; -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org