File 0234-erts-Fix-open_port-spawn-a-args-error-info... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0234-erts-Fix-open_port-spawn-a-args-error-info.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Currently displaying revision b86624bd0b247ddee296914ae2ffe962 , Show latest

From 843b439591244aef59da8a59c71c3ad3ccedf95b Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Wed, 17 Nov 2021 10:53:30 +0100
Subject: [PATCH] erts: Fix open_port({spawn,"a"},[{args,[]}]) error info

Before this fix the error reason would be "invalid port name",
which is true but not as helpfull as it could be. So now it returns
"must be spawn_executable".
---
 erts/emulator/test/exception_SUITE.erl |  1 +
 lib/kernel/src/erl_erts_errors.erl     | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/erts/emulator/test/exception_SUITE.erl b/erts/emulator/test/exception_SUITE.erl
index 60f1fcdf5d..f31ffbd573 100644
--- a/erts/emulator/test/exception_SUITE.erl
+++ b/erts/emulator/test/exception_SUITE.erl
@@ -1032,6 +1032,7 @@ error_info(_Config) ->
          {open_port, [{bad,name}, []]},
          {open_port, [{spawn, "no_command"}, bad_option_list]},
          {open_port, [{spawn, "no_command"}, [xyz]]},
+         {open_port, [{spawn, "no_command"}, [{args,[]}]],[{1,".*spawn_executable.*"}]},
 
          {port_call, 2},                        %Internal BIF.
 
diff --git a/lib/kernel/src/erl_erts_errors.erl b/lib/kernel/src/erl_erts_errors.erl
index 8b0768ac80..b6a8ce846f 100644
--- a/lib/kernel/src/erl_erts_errors.erl
+++ b/lib/kernel/src/erl_erts_errors.erl
@@ -589,12 +589,19 @@ format_erlang_error(node, [_], _) ->
     [not_pid];
 format_erlang_error(nodes, [_], _) ->
     [<<"not a valid node type">>];
-format_erlang_error(open_port, [Name,_Settings], Cause) ->
+format_erlang_error(open_port, [Name, Settings], Cause) ->
     case Cause of
         badopt ->
             [must_be_tuple(Name),bad_option];
+        _ when is_tuple(Name) ->
+            case lists:keysearch(args, 1, Settings) of
+                {value,_} when element(1,Name) =/= spawn_executable ->
+                    [<<"must be spawn_executable">>];
+                _ ->
+                    [<<"invalid port name">>]
+            end;
         _ ->
-            [must_be_tuple(Name, <<"invalid port name">>)]
+            must_be_tuple(Name)
     end;
 format_erlang_error(phash, [_,N], _) ->
     [must_be_pos_int(N)];
-- 
2.31.1

Places

File 0234-erts-Fix-open_port-spawn-a-args-error-info.patch of Package erlang (Revision b86624bd0b247ddee296914ae2ffe962)

Places