From patchwork Mon Jul 24 18:27:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 792967 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="i3fkuV8R"; dkim-atps=neutral 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 3xGVVB0vgbz9s3T for ; Tue, 25 Jul 2017 04:37:37 +1000 (AEST) Received: from localhost ([::1]:56356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZiEZ-0007Ed-Lh for incoming@patchwork.ozlabs.org; Mon, 24 Jul 2017 14:37:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZi5u-0008V8-Ik for qemu-devel@nongnu.org; Mon, 24 Jul 2017 14:28:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZi5t-0004oy-Ko for qemu-devel@nongnu.org; Mon, 24 Jul 2017 14:28:38 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:35924) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZi5t-0004on-H8; Mon, 24 Jul 2017 14:28:37 -0400 Received: by mail-qk0-x243.google.com with SMTP id d136so10665960qkg.3; Mon, 24 Jul 2017 11:28:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2VCA6ci3zhhoe80qtBC1tJlOXxnuy9ZJf6/QUBn12bw=; b=i3fkuV8Rp7Rli7v2Bcf1vblnI8bGjyAjajDiaTCVaLuKKmECMG1nefcD0Pjm4gu7uQ 7LfDgyKKvUL5F4SIv8TOOmTlqmLlfdTWrmxGZYWB1Nq/to+U345IpVC4pA0kw4UlWT4A eAMhEh0gRB4QI5DKjCFpLdfwvoU+OvxPRpjeO6pYSfSAsfiSBInH+iaquHC+KCBys9ky Ux5ZbTT4Td88yuQbOL2DiyrnB8m7Ex4tO5Fof4VGpAgR6STojH9UmuRih8vnS0/0pDUN dZmJFL7norn5nJaz/B1QiyD6Pjo9grYbYYRVx2ygPF32lzQuIp1O9354PaRj79FZNcka 1llw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2VCA6ci3zhhoe80qtBC1tJlOXxnuy9ZJf6/QUBn12bw=; b=Wa4wWJJhuTTRtpuSwHF+fHLFhhOg8M6MgbXJvhWkz6G1ElMPiCRv6qO+HO4LGfU+83 GuwVmqWavWJNn5zxlDqFyShRJgrVxBOzg+6Qd8wHgEx11J/E1Ae0/GsdIBpls6xLbN33 9w8afTZRE+kPWcpZ0fmUnPfoAn49XGYm9klrsWi6WA5FUX6t1/Z9Hetu3hU6t2PZS0jv Wf7U+ZG1fRVlUKP8/9LPQV0N/kbwg7yESGiVvoernDwyx/Ni7HAaBOI/f++0PkYd50pE qPsShbylbhGt5yJG/+rlY/DvysUD9UsOB0w7qpdROFSEWw2A19T7+5a+tmBg+W3b0OIK oHaQ== X-Gm-Message-State: AIVw113utoXcKWZlev3fsreGgkFk9WDEdBCbUq2CxWlv0C2a+qaShiuO 0WrfuKiyevzwKw== X-Received: by 10.55.33.77 with SMTP id h74mr22980670qkh.353.1500920917080; Mon, 24 Jul 2017 11:28:37 -0700 (PDT) Received: from yoga.offpageads.com ([138.117.48.223]) by smtp.gmail.com with ESMTPSA id t57sm9033799qtt.18.2017.07.24.11.28.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Jul 2017 11:28:36 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Eric Blake , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann Date: Mon, 24 Jul 2017 15:27:25 -0300 Message-Id: <20170724182751.18261-10-f4bug@amsat.org> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170724182751.18261-1-f4bug@amsat.org> References: <20170724182751.18261-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH for 2.10 09/35] ui/vnc: fix leak of SocketAddress ** X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Extract the (correct) cleaning code as a new function vnc_free_addresses() then use it to remove the memory leaks. Reported-by: Clang Static Analyzer Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrange --- ui/vnc.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index eb91559b6b..651cbb8606 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3521,6 +3521,20 @@ static int vnc_display_get_address(const char *addrstr, return ret; } +static void vnc_free_addresses(SocketAddress ***retsaddr, + size_t *retnsaddr) +{ + size_t i; + + for (i = 0; i < *retnsaddr; i++) { + qapi_free_SocketAddress((*retsaddr)[i]); + } + g_free(*retsaddr); + + *retsaddr = NULL; + *retnsaddr = 0; +} + static int vnc_display_get_addresses(QemuOpts *opts, bool reverse, SocketAddress ***retsaddr, @@ -3538,7 +3552,6 @@ static int vnc_display_get_addresses(QemuOpts *opts, bool has_ipv6 = qemu_opt_get(opts, "ipv6"); bool ipv4 = qemu_opt_get_bool(opts, "ipv4", false); bool ipv6 = qemu_opt_get_bool(opts, "ipv6", false); - size_t i; int displaynum = -1; int ret = -1; @@ -3614,16 +3627,8 @@ static int vnc_display_get_addresses(QemuOpts *opts, ret = 0; cleanup: if (ret < 0) { - for (i = 0; i < *retnsaddr; i++) { - qapi_free_SocketAddress((*retsaddr)[i]); - } - g_free(*retsaddr); - for (i = 0; i < *retnwsaddr; i++) { - qapi_free_SocketAddress((*retwsaddr)[i]); - } - g_free(*retwsaddr); - *retsaddr = *retwsaddr = NULL; - *retnsaddr = *retnwsaddr = 0; + vnc_free_addresses(retsaddr, retnsaddr); + vnc_free_addresses(retwsaddr, retnwsaddr); } return ret; } @@ -3772,7 +3777,6 @@ void vnc_display_open(const char *id, Error **errp) int acl = 0; int lock_key_sync = 1; int key_delay_ms; - size_t i; if (!vd) { error_setg(errp, "VNC display not active"); @@ -3993,12 +3997,8 @@ void vnc_display_open(const char *id, Error **errp) } cleanup: - for (i = 0; i < nsaddr; i++) { - qapi_free_SocketAddress(saddr[i]); - } - for (i = 0; i < nwsaddr; i++) { - qapi_free_SocketAddress(wsaddr[i]); - } + vnc_free_addresses(&saddr, &nsaddr); + vnc_free_addresses(&wsaddr, &nwsaddr); return; fail: