From 5b2ec662220d87aa95d3794e7748a00c1163bcd6 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Fri, 3 Feb 2023 16:53:44 +0100
Subject: [PATCH] Simplify error handling on socket creation

On any error, all previously opened sockets must be closed.

Handle these errors in a single catch-block. Currently, there are only 2
sockets, but this will simplify even more with more sockets.

Note: this commit is better displayed with --ignore-space-change (-b).
---
 .../genymobile/scrcpy/DesktopConnection.java  | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java b/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java
index 1f8f46e4..3cb36a09 100644
--- a/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java
+++ b/server/src/main/java/com/genymobile/scrcpy/DesktopConnection.java
@@ -58,34 +58,34 @@ public final class DesktopConnection implements Closeable {
     public static DesktopConnection open(int scid, boolean tunnelForward, boolean control, boolean sendDummyByte) throws IOException {
         String socketName = getSocketName(scid);
 
-        LocalSocket videoSocket;
+        LocalSocket videoSocket = null;
         LocalSocket controlSocket = null;
-        if (tunnelForward) {
-            try (LocalServerSocket localServerSocket = new LocalServerSocket(socketName)) {
-                videoSocket = localServerSocket.accept();
-                if (sendDummyByte) {
-                    // send one byte so the client may read() to detect a connection error
-                    videoSocket.getOutputStream().write(0);
-                }
-                if (control) {
-                    try {
+        try {
+            if (tunnelForward) {
+                try (LocalServerSocket localServerSocket = new LocalServerSocket(socketName)) {
+                    videoSocket = localServerSocket.accept();
+                    if (sendDummyByte) {
+                        // send one byte so the client may read() to detect a connection error
+                        videoSocket.getOutputStream().write(0);
+                    }
+                    if (control) {
                         controlSocket = localServerSocket.accept();
-                    } catch (IOException | RuntimeException e) {
-                        videoSocket.close();
-                        throw e;
                     }
                 }
-            }
-        } else {
-            videoSocket = connect(socketName);
-            if (control) {
-                try {
+            } else {
+                videoSocket = connect(socketName);
+                if (control) {
                     controlSocket = connect(socketName);
-                } catch (IOException | RuntimeException e) {
-                    videoSocket.close();
-                    throw e;
                 }
             }
+        } catch (IOException | RuntimeException e) {
+            if (videoSocket != null) {
+                videoSocket.close();
+            }
+            if (controlSocket != null) {
+                controlSocket.close();
+            }
+            throw e;
         }
 
         return new DesktopConnection(videoSocket, controlSocket);