From 79974e7ad94e7658c780e3b446a7822a533675e4 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 15 Jul 2016 23:11:25 +0200
Subject: 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.
---
 audio/mixer.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'audio')

diff --git a/audio/mixer.c b/audio/mixer.c
index a58a814649..795edfa628 100644
--- a/audio/mixer.c
+++ b/audio/mixer.c
@@ -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;
 }
-- 
cgit v1.2.3