Procházet zdrojové kódy

Close socket file descriptor when qemu_accept fails

Signed-off-by: Shahar Havivi <shaharh@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Shahar Havivi před 15 roky
rodič
revize
d092c108ff
1 změnil soubory, kde provedl 3 přidání a 2 odebrání
  1. 3 2
      migration-tcp.c

+ 3 - 2
migration-tcp.c

@@ -151,7 +151,7 @@ static void tcp_accept_incoming_migration(void *opaque)
 
 
     if (c == -1) {
     if (c == -1) {
         fprintf(stderr, "could not accept migration connection\n");
         fprintf(stderr, "could not accept migration connection\n");
-        return;
+        goto out2;
     }
     }
 
 
     f = qemu_fopen_socket(c);
     f = qemu_fopen_socket(c);
@@ -163,9 +163,10 @@ static void tcp_accept_incoming_migration(void *opaque)
     process_incoming_migration(f);
     process_incoming_migration(f);
     qemu_fclose(f);
     qemu_fclose(f);
 out:
 out:
+    close(c);
+out2:
     qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
     qemu_set_fd_handler2(s, NULL, NULL, NULL, NULL);
     close(s);
     close(s);
-    close(c);
 }
 }
 
 
 int tcp_start_incoming_migration(const char *host_port)
 int tcp_start_incoming_migration(const char *host_port)