mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

paaudio: fix possible resource leak

Browse Source 
qpa_audio_init did not clean up resources properly if the initialization
failed. This hopefully fixes it.

Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Kővágó, Zoltán 2015-06-03 23:03:53 +02:00 committed by Gerd Hoffmann
parent f2dcc6cec2
commit 49dd6d0d33
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/paaudio.c
View File

@ -47,6 +47,8 @@ typedef struct {
paaudio *g; paaudio *g;
} PAVoiceIn; } PAVoiceIn;
static void qpa_audio_fini(void *opaque);
static void GCC_FMT_ATTR (2, 3) qpa_logerr (int err, const char *fmt, ...) static void GCC_FMT_ATTR (2, 3) qpa_logerr (int err, const char *fmt, ...)
{ {
va_list ap; va_list ap;
@ -814,6 +816,8 @@ static void *qpa_audio_init (void)
{ {
paaudio *g = g_malloc(sizeof(paaudio)); paaudio *g = g_malloc(sizeof(paaudio));
g->conf = glob_conf; g->conf = glob_conf;
g->mainloop = NULL;
g->context = NULL;
g->mainloop = pa_threaded_mainloop_new (); g->mainloop = pa_threaded_mainloop_new ();
if (!g->mainloop) { if (!g->mainloop) {
@ -867,7 +871,7 @@ unlock_and_fail:
pa_threaded_mainloop_unlock (g->mainloop); pa_threaded_mainloop_unlock (g->mainloop);
fail: fail:
AUD_log (AUDIO_CAP, "Failed to initialize PA context"); AUD_log (AUDIO_CAP, "Failed to initialize PA context");
g_free(g); qpa_audio_fini(g);
return NULL; return NULL;
} }