From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHzYS-0007qi-6z for qemu-devel@nongnu.org; Sun, 23 Oct 2011 11:01:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RHzYQ-0001bo-Pq for qemu-devel@nongnu.org; Sun, 23 Oct 2011 11:01:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65529) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHzYQ-0001bZ-2N for qemu-devel@nongnu.org; Sun, 23 Oct 2011 11:01:38 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9NF1bCQ017326 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 23 Oct 2011 11:01:37 -0400 Received: from bow.tlv.redhat.com (dhcp-3-73.tlv.redhat.com [10.35.3.73]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p9NF1XrI003143 for ; Sun, 23 Oct 2011 11:01:36 -0400 From: Alon Levy Date: Sun, 23 Oct 2011 16:58:52 +0200 Message-Id: <1319381932-22901-3-git-send-email-alevy@redhat.com> In-Reply-To: <1319381932-22901-1-git-send-email-alevy@redhat.com> References: <1319381932-22901-1-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] libcacard/vscclient: fix error paths for socket creation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Alon Levy --- libcacard/vscclient.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c index 2191f60..e317a25 100644 --- a/libcacard/vscclient.c +++ b/libcacard/vscclient.c @@ -357,6 +357,7 @@ connect_to_qemu( if (sock < 0) { /* Error */ fprintf(stderr, "Error opening socket!\n"); + return -1; } memset(&hints, 0, sizeof(struct addrinfo)); @@ -370,13 +371,13 @@ connect_to_qemu( if (ret != 0) { /* Error */ fprintf(stderr, "getaddrinfo failed\n"); - return 5; + return -1; } if (connect(sock, server->ai_addr, server->ai_addrlen) < 0) { /* Error */ fprintf(stderr, "Could not connect\n"); - return 5; + return -1; } if (verbose) { printf("Connected (sizeof Header=%zd)!\n", sizeof(VSCMsgHeader)); @@ -505,6 +506,10 @@ main( qemu_host = strdup(argv[argc - 2]); qemu_port = strdup(argv[argc - 1]); sock = connect_to_qemu(qemu_host, qemu_port); + if (sock == -1) { + fprintf(stderr, "error opening socket, exiting.\n"); + exit(5); + } qemu_mutex_init(&write_lock); qemu_mutex_init(&pending_reader_lock); -- 1.7.6.4