virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavc/vvcdec: ensure slices contain nonzero CTUs

Browse Source 
fixes https://github.com/ffvvc/tests/tree/main/fuzz/passed/000323.bit

Co-authored-by: Frank Plowman <post@frankplowman.com>
This commit is contained in:
Nuo Mi
2025-01-26 11:10:21 +08:00
parent 974d4a8f0a
commit ca3550948c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/vvc/ps.c
View File

@@ -1232,7 +1232,7 @@ static int sh_alf_aps(const VVCSH *sh, const VVCFrameParamSets *fps)
return 0; return 0;
} }
static void sh_slice_address(VVCSH *sh, const H266RawSPS *sps, const VVCPPS *pps) static int sh_slice_address(VVCSH *sh, const H266RawSPS *sps, const VVCPPS *pps)
{ {
const int slice_address = sh->r->sh_slice_address; const int slice_address = sh->r->sh_slice_address;
@@ -1256,6 +1256,11 @@ static void sh_slice_address(VVCSH *sh, const H266RawSPS *sps, const VVCPPS *pps
sh->num_ctus_in_curr_slice += pps->r->row_height_val[tile_y] * pps->r->col_width_val[tile_x]; sh->num_ctus_in_curr_slice += pps->r->row_height_val[tile_y] * pps->r->col_width_val[tile_x];
} }
} }
if (!sh->num_ctus_in_curr_slice)
return AVERROR_INVALIDDATA;
return 0;
} }
static void sh_qp_y(VVCSH *sh, const H266RawPPS *pps, const H266RawPictureHeader *ph) static void sh_qp_y(VVCSH *sh, const H266RawPPS *pps, const H266RawPictureHeader *ph)
@@ -1352,7 +1357,9 @@ static int sh_derive(VVCSH *sh, const VVCFrameParamSets *fps)
const H266RawPictureHeader *ph = fps->ph.r; const H266RawPictureHeader *ph = fps->ph.r;
int ret; int ret;
sh_slice_address(sh, sps, fps->pps); ret = sh_slice_address(sh, sps, fps->pps);
if (ret < 0)
return ret;
ret = sh_alf_aps(sh, fps); ret = sh_alf_aps(sh, fps);
if (ret < 0) if (ret < 0)
return ret; return ret;