RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

audio: fix crashes due to broken uninit check 

Since mixer->ao is always NULL now (it was really just forgotten to be
removed), the uninit call never actually cleared the af field, leaving
a dangling pointer that could be accessed by volume control.
This commit is contained in:
wm4 2016-07-15 23:11:25 +02:00
parent ea18cb99ba
commit 79974e7ad9
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
audio/mixer.c
View File

@ -23,7 +23,6 @@
#include <libavutil/common.h>
#include "config.h"
#include "audio/out/ao.h"
#include "audio/filter/af.h"
#include "common/global.h"
#include "common/msg.h"
@ -33,7 +32,6 @@
struct mixer {
struct mp_log *log;
struct MPOpts *opts;
struct ao *ao;
struct af_stream *af;
// Other stuff
float balance;
@ -145,8 +143,5 @@ void mixer_reinit_audio(struct mixer *mixer, struct af_stream *af)
*/
void mixer_uninit_audio(struct mixer *mixer)
{
if (!mixer->ao)
return;
mixer->af = NULL;
}