[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 22/26] libcacard/vscclient: fix leakage of socket o
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 22/26] libcacard/vscclient: fix leakage of socket on error paths |
Date: |
Fri, 14 Jun 2013 14:50:38 +0400 |
From: Alon Levy <address@hidden>
Spotted by Coverity.
Signed-off-by: Alon Levy <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
libcacard/vscclient.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/libcacard/vscclient.c b/libcacard/vscclient.c
index ac23647..5180d29 100644
--- a/libcacard/vscclient.c
+++ b/libcacard/vscclient.c
@@ -618,18 +618,22 @@ connect_to_qemu(
if (ret != 0) {
/* Error */
fprintf(stderr, "getaddrinfo failed\n");
- return -1;
+ goto cleanup_socket;
}
if (connect(sock, server->ai_addr, server->ai_addrlen) < 0) {
/* Error */
fprintf(stderr, "Could not connect\n");
- return -1;
+ goto cleanup_socket;
}
if (verbose) {
printf("Connected (sizeof Header=%zd)!\n", sizeof(VSCMsgHeader));
}
return sock;
+
+cleanup_socket:
+ closesocket(sock);
+ return -1;
}
int
@@ -759,5 +763,6 @@ main(
g_io_channel_unref(channel_socket);
g_byte_array_unref(socket_to_send);
+ closesocket(sock);
return 0;
}
--
1.7.10.4
- [Qemu-trivial] [PULL 10/26] gtk: implement -full-screen, (continued)
- [Qemu-trivial] [PULL 10/26] gtk: implement -full-screen, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 16/26] hw/xen: Use g_free instead of free and fix potential memory leaks, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 24/26] create qemu_openpty_raw() helper function and move it to a separate file, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 14/26] hw/scsi: Don't increment a boolean value, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 26/26] piix: fix some printf errors when debug is enabled, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 09/26] char/serial: serial_ioport_write: Factor out common code, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 20/26] KVM: PPC: Add dummy kvm_arch_init_irq_routing(), Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 07/26] char/serial: cosmetic fixes., Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 17/26] ivshmem: add missing error exit(2), Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 08/26] char/serial: Use generic Fifo8, Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 22/26] libcacard/vscclient: fix leakage of socket on error paths,
Michael Tokarev <=
- [Qemu-trivial] [PULL 18/26] KVM: ARM: Add dummy kvm_arch_init_irq_routing(), Michael Tokarev, 2013/06/14
- [Qemu-trivial] [PULL 21/26] linux-headers: Update to v3.10-rc5, Michael Tokarev, 2013/06/14
- Re: [Qemu-trivial] [PULL 00/26] Trivial-patches pull request for 2013-06-14, Anthony Liguori, 2013/06/17