Fix leaks

Signed-off-by: Peter M <petermm@gmail.com>

Author: petermm

libs/estdlib/src/socket_dist.erl

@@ -43,32 +43,46 @@ listen(Name) ->
 -spec listen(string(), non_neg_integer()) ->
     {ok, {any(), #net_address{}, pos_integer()}} | {error, any()}.
 listen(Name, SocketPort) ->
-    {ok, LSock} = socket:open(inet, stream, tcp),
-    case
-        socket:bind(LSock, #{
-            family => inet,
-            port => SocketPort,
-            addr => {0, 0, 0, 0}
-        })
-    of
-        ok ->
-            ok = socket:listen(LSock),
-            {ok, #{addr := Addr, port := Port}} = socket:sockname(LSock),
+    case socket:open(inet, stream, tcp) of
+        {ok, LSock} ->
+            try do_listen(Name, LSock, SocketPort) of
+                {ok, _} = Ok -> Ok;
+                Error -> socket:close(LSock), Error
+            catch
+                Class:Reason:Stack ->
+                    socket:close(LSock),
+                    erlang:raise(Class, Reason, Stack)
+            end;
+        {error, _} = Error ->
+            Error
+    end.
+
+do_listen(Name, LSock, SocketPort) ->
+    case socket:bind(LSock, #{family => inet, port => SocketPort, addr => {0, 0, 0, 0}}) of
+        ok -> do_listen_bound(Name, LSock);
+        {error, _} = Error -> Error
+    end.
+
+do_listen_bound(Name, LSock) ->
+    case socket:listen(LSock) of
+        ok -> do_listen_listening(Name, LSock);
+        {error, _} = Error -> Error
+    end.
+
+do_listen_listening(Name, LSock) ->
+    case socket:sockname(LSock) of
+        {ok, #{addr := Addr, port := Port}} ->
             ErlEpmd = net_kernel:epmd_module(),
             Address = #net_address{
                 host = Addr,
                 protocol = tcp,
                 family = inet
             },
             case ErlEpmd:register_node(Name, Port) of
-                {ok, Creation} ->
-                    {ok, {LSock, Address, Creation}};
-                Error ->
-                    socket:close(LSock),
-                    Error
+                {ok, Creation} -> {ok, {LSock, Address, Creation}};
+                {error, _} = Error -> Error
             end;
         {error, _} = Error ->
-            socket:close(LSock),
             Error
     end.
 
@@ -153,28 +167,36 @@ do_setup(Kernel, Node, Type, MyNode, _LongNames, SetupTime) ->
                     case ErlEpmd:port_please(Name, Ip) of
                         {port, TcpPort, Version} ->
                             dist_util:reset_timer(Timer),
-                            {ok, Sock} = socket:open(inet, stream, tcp),
-                            case
-                                socket:connect(Sock, #{family => inet, addr => Ip, port => TcpPort})
-                            of
-                                ok ->
-                                    {ok, DistController} = socket_dist_controller:start(Sock),
-                                    true = socket_dist_controller:supervisor(
-                                        DistController, self()
-                                    ),
-                                    HSData = hs_data(
-                                        Kernel,
-                                        MyNode,
-                                        DistController,
-                                        [],
-                                        Node,
-                                        Version,
-                                        Type,
-                                        Timer
-                                    ),
-                                    dist_util:handshake_we_started(HSData);
-                                Other1 ->
-                                    ?shutdown2(Node, {unexpected, Other1})
+                            case socket:open(inet, stream, tcp) of
+                                {ok, Sock} ->
+                                    case
+                                        socket:connect(Sock, #{
+                                            family => inet, addr => Ip, port => TcpPort
+                                        })
+                                    of
+                                        ok ->
+                                            {ok, DistController} =
+                                                socket_dist_controller:start(Sock),
+                                            true = socket_dist_controller:supervisor(
+                                                DistController, self()
+                                            ),
+                                            HSData = hs_data(
+                                                Kernel,
+                                                MyNode,
+                                                DistController,
+                                                [],
+                                                Node,
+                                                Version,
+                                                Type,
+                                                Timer
+                                            ),
+                                            dist_util:handshake_we_started(HSData);
+                                        ConnectError ->
+                                            socket:close(Sock),
+                                            ?shutdown2(Node, {unexpected, ConnectError})
+                                    end;
+                                OpenError ->
+                                    ?shutdown2(Node, {unexpected, OpenError})
                             end;
                         Other2 ->
                             ?shutdown2(Node, {unexpected, Other2})