RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-27 13:49:33 +00:00
Code Issues Releases Wiki Activity

audio: fix crash during uninit on ao_lavc

Browse Source 
The buffer state can be null when using --ao=lavc, so just check it
first. Fixes #10175.
This commit is contained in:
Dudemanguy 2023-01-12 16:43:44 -06:00
parent 95a76f0692
commit 9a9039deb2
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
audio/out/buffer.c
View File

@ -459,7 +459,7 @@ void ao_uninit(struct ao *ao)
{ {
struct buffer_state *p = ao->buffer_state; struct buffer_state *p = ao->buffer_state;
if (p->thread_valid) { if (p && p->thread_valid) {
pthread_mutex_lock(&p->pt_lock); pthread_mutex_lock(&p->pt_lock);
p->terminate = true; p->terminate = true;
pthread_cond_broadcast(&p->pt_wakeup); pthread_cond_broadcast(&p->pt_wakeup);
@ -472,17 +472,19 @@ void ao_uninit(struct ao *ao)
if (ao->driver_initialized) if (ao->driver_initialized)
ao->driver->uninit(ao); ao->driver->uninit(ao);
talloc_free(p->filter_root); if (p) {
talloc_free(p->queue); talloc_free(p->filter_root);
talloc_free(p->pending); talloc_free(p->queue);
talloc_free(p->convert_buffer); talloc_free(p->pending);
talloc_free(p->temp_buf); talloc_free(p->convert_buffer);
talloc_free(p->temp_buf);
pthread_cond_destroy(&p->wakeup); pthread_cond_destroy(&p->wakeup);
pthread_mutex_destroy(&p->lock); pthread_mutex_destroy(&p->lock);
pthread_cond_destroy(&p->pt_wakeup); pthread_cond_destroy(&p->pt_wakeup);
pthread_mutex_destroy(&p->pt_lock); pthread_mutex_destroy(&p->pt_lock);
}
talloc_free(ao); talloc_free(ao);
} }