From patchwork Wed Jun 3 21:03:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 480208 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2E4B41402A0 for ; Thu, 4 Jun 2015 07:07:10 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Q1GfEaQv; dkim-atps=neutral Received: from localhost ([::1]:38158 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0FsS-0004aM-83 for incoming@patchwork.ozlabs.org; Wed, 03 Jun 2015 17:07:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0FpP-0007iB-5r for qemu-devel@nongnu.org; Wed, 03 Jun 2015 17:03:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0FpN-0005iT-42 for qemu-devel@nongnu.org; Wed, 03 Jun 2015 17:03:59 -0400 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]:34949) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0FpM-0005iG-U1 for qemu-devel@nongnu.org; Wed, 03 Jun 2015 17:03:57 -0400 Received: by wiga1 with SMTP id a1so27777888wig.0 for ; Wed, 03 Jun 2015 14:03:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=q4eVa93aNk+7/AgvGNS4PenTejW30Mnqb00sUgKI1xk=; b=Q1GfEaQvmZjm920fIl4wJzD0FLgUFrToPYR7SixlaLCNkXnz01eDfGu50TyEBUim99 Eqv00Om5TmwLgiMA7P5q06fOGz7CLe9CQd4kdadsWT05VSO/sXe9kVEw5AxkFHMraqRe msefkL1/P27+0dFlbm6myiJkfGNiW0DrICFP0EH+gMmbt6uN5HOBvBLVcZddT6w1an5w FkvNFTCATsnXkFHngbyDX5igL19ZCaWXHmjsLyuWsdjCNOL5J+YjoCZsE3WTppuPnrrO waN5X1HyU7P7vTk+L0j7ZlNP/RqA0VArOZAP2y8N1h+FuiY3193tVXaT5UgsQDpgMj7f j3Wg== X-Received: by 10.194.61.180 with SMTP id q20mr62362744wjr.80.1433365436437; Wed, 03 Jun 2015 14:03:56 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (94-21-43-102.pool.digikabel.hu. [94.21.43.102]) by mx.google.com with ESMTPSA id l6sm2727050wjz.4.2015.06.03.14.03.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jun 2015 14:03:56 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: peter.maydell@linaro.org, qemu-devel@nongnu.org Date: Wed, 3 Jun 2015 23:03:53 +0200 Message-Id: <1e253c56d994129252d1a7c04c921be00e9ccd8b.1433365252.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::235 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH v3 10/12] paaudio: fix possible resource leak X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- audio/paaudio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index 35e8887..fea6071 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -47,6 +47,8 @@ typedef struct { paaudio *g; } PAVoiceIn; +static void qpa_audio_fini(void *opaque); + static void GCC_FMT_ATTR (2, 3) qpa_logerr (int err, const char *fmt, ...) { va_list ap; @@ -814,6 +816,8 @@ static void *qpa_audio_init (void) { paaudio *g = g_malloc(sizeof(paaudio)); g->conf = glob_conf; + g->mainloop = NULL; + g->context = NULL; g->mainloop = pa_threaded_mainloop_new (); if (!g->mainloop) { @@ -867,7 +871,7 @@ unlock_and_fail: pa_threaded_mainloop_unlock (g->mainloop); fail: AUD_log (AUDIO_CAP, "Failed to initialize PA context"); - g_free(g); + qpa_audio_fini(g); return NULL; }