Skip to contentSkip to conversation

Close socket file descriptor when qemu_accept fails

PATCH Applied Shahar Havivi 2 participants 2 messages Jul 24, 2010 – Jul 25, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Close socket file descriptor when qemu_accept fails

---
 migration-tcp.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
migration-tcp.c +3 -2
index 78b56dc..b55f419 100644
@@ -151,7 +151,7 @@ static void tcp_accept_incoming_migration(void *opaque)
 
     if (c == -1) {
         fprintf(stderr, "could not accept migration connection\n");
-        return;
+        goto out2;
     }
 
     f = qemu_fopen_socket(c);
@@ -163,9 +163,10 @@ static void tcp_accept_incoming_migration(void *opaque)
     process_incoming_migration(f);
     qemu_fclose(f);
 out:
+    close(c);
+out2:
     qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
     close(s);
-    close(c);
 }
 
 int tcp_start_incoming_migration(const char *host_port)
Signature · 1 line
1.7.1.1
#1 lore raw
Quoted 5 lines · Shahar Havivi
---
 migration-tcp.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Thanks, applied.

Quoted 30 lines
migration-tcp.c +3 -2
index 78b56dc..b55f419 100644
@@ -151,7 +151,7 @@ static void tcp_accept_incoming_migration(void *opaque)
 
     if (c == -1) {
         fprintf(stderr, "could not accept migration connection\n");
-        return;
+        goto out2;
     }
 
     f = qemu_fopen_socket(c);
@@ -163,9 +163,10 @@ static void tcp_accept_incoming_migration(void *opaque)
     process_incoming_migration(f);
     qemu_fclose(f);
 out:
+    close(c);
+out2:
     qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
     close(s);
-    close(c);
 }
 
 int tcp_start_incoming_migration(const char *host_port)
Signature · 1 line
1.7.1.1
Signature · 2 lines
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
[email protected]                 http://www.aurel32.net