From patchwork Mon Jun 1 13:23:49 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: 479043 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 67C06140E5E for ; Mon, 1 Jun 2015 23:32:19 +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=XImxbg3L; dkim-atps=neutral Received: from localhost ([::1]:52551 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzPpA-0008FN-31 for incoming@patchwork.ozlabs.org; Mon, 01 Jun 2015 09:32:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzPhX-00030V-7W for qemu-devel@nongnu.org; Mon, 01 Jun 2015 09:24:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzPhT-0007kP-Qj for qemu-devel@nongnu.org; Mon, 01 Jun 2015 09:24:23 -0400 Received: from mail-wg0-x234.google.com ([2a00:1450:400c:c00::234]:35874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzPhT-0007kH-L4 for qemu-devel@nongnu.org; Mon, 01 Jun 2015 09:24:19 -0400 Received: by wgbgq6 with SMTP id gq6so114386154wgb.3 for ; Mon, 01 Jun 2015 06:24:19 -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=XImxbg3LHtOG+borp2ujh5aZhkbpZQRPEHYSA0UX6pmRdG7zhcN4q1nJyRaX7j0iGB Owvj07Mv77nhqV8kxbKanrCP+0OxYZ2PwZ01otAI+dIGyHXLkgDR9jHsp210uiynIF8n HHl3r+i8bQHAgq3B4EGScBKUysWCvrqfBQVoJc69oJmqnoI4z4JOowq3wLAZjzz1XEeb bQp9RJzjn/PBRZQquKAhV/iLA6sXmx4Hdcj8feaTV37VZa6m3UI5+2wpIUmGSobHHmh8 hIT2NhEOosC/Cmx5W7jcD8nUPa7u8fARpIxmrMtVqmK1HkY37GgoSQ2Bza47n+NRkPRw L8fQ== X-Received: by 10.180.102.74 with SMTP id fm10mr21015778wib.25.1433165059151; Mon, 01 Jun 2015 06:24:19 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (212-40-90-210.pool.digikabel.hu. [212.40.90.210]) by mx.google.com with ESMTPSA id js3sm21917842wjc.5.2015.06.01.06.24.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Jun 2015 06:24:18 -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: qemu-devel@nongnu.org Date: Mon, 1 Jun 2015 15:23:49 +0200 Message-Id: <9f9c25f2d4fcea8d41a31c1263d4281f5156a510.1433164051.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:c00::234 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 11/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; }