4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

media-playback: Fix possible crash on startup

Browse source 
Frame width/height check crash if the frame is not given.

We can reorder width/height check after other precondition checks.
This commit is contained in:
jeiea 2025-04-28 23:26:29 +09:00 • committed by Ryan Foster
commit 22c4e11ec8
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shared/media-playback/media-playback/media.c
View file

@ -382,12 +382,6 @@ void mp_media_next_video(mp_media_t *m, bool preload)
enum video_range_type new_range; enum video_range_type new_range;
AVFrame *f = d->frame; AVFrame *f = d->frame;
if (!f->width || !f->height) {
blog(LOG_ERROR, "MP: media frame width or height are zero ('%s': %" PRIu32 "x%" PRIu32 ")", m->path,
f->width, f->height);
return;
}
if (!preload) { if (!preload) {
if (!mp_media_can_play_frame(m, d)) if (!mp_media_can_play_frame(m, d))
return; return;
@ -400,6 +394,12 @@ void mp_media_next_video(mp_media_t *m, bool preload)
return; return;
} }
if (!f->width || !f->height) {
blog(LOG_ERROR, "MP: media frame width or height are zero ('%s': %" PRIu32 "x%" PRIu32 ")", m->path,
f->width, f->height);
return;
}
bool flip = false; bool flip = false;
if (m->swscale) { if (m->swscale) {
int ret = sws_scale(m->swscale, (const uint8_t *const *)f->data, f->linesize, 0, f->height, int ret = sws_scale(m->swscale, (const uint8_t *const *)f->data, f->linesize, 0, f->height,