RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-27 02:40:53 +00:00
Code Issues Releases Wiki Activity

zimg: fix abort on subsampled input with odd heights

Browse Source 
We make the assumption that there is more buffer available
than indicated, this needs to be considered in this specific
location too as mp_image_crop understandably checks whether
we're about to do something unsafe.

minimal reproducer: mpv av://lavfi:testsrc -vf crop=320:239,format=yuv420p -o test.png

fixes #10469
This commit is contained in:
sfan5 2023-07-24 21:11:48 +02:00
parent 3bc75d02e0
commit ee25d0d2e0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
video/zimg.c
View File

@ -268,7 +268,14 @@ static bool wrap_buffer(struct mp_zimg_state *st, struct mp_zimg_repack *r,
if (r->pack) { if (r->pack) {
mpi = &r->cropped_tmp; mpi = &r->cropped_tmp;
*mpi = *a_mpi; *mpi = *a_mpi;
mp_image_crop(mpi, 0, st->slice_y, mpi->w, st->slice_y + st->slice_h); int y1 = st->slice_y + st->slice_h;
// Due to subsampling we may assume the image to be bigger than it
// actually is (see real_h in setup_format).
if (mpi->h < y1) {
assert(y1 - mpi->h < 4);
mp_image_set_size(mpi, mpi->w, y1);
}
mp_image_crop(mpi, 0, st->slice_y, mpi->w, y1);
} }
bool direct[MP_MAX_PLANES] = {0}; bool direct[MP_MAX_PLANES] = {0};