diff options
| author | Sverker Eriksson <[email protected]> | 2016-04-14 15:15:48 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-04-14 15:15:48 +0200 |
| commit | 965aabe043074edbeca06ee2083c06be731c939b (patch) | |
| tree | f65e329a6b055fe38a68d63c3a997eeb8f60df0b /erts/emulator/beam | |
| parent | 04e79317308588af47f236469e9d286dccc177ec (diff) | |
| parent | 588ed7d503f7f607ec91d102f16573ee5d64ea7b (diff) | |
| download | otp-965aabe043074edbeca06ee2083c06be731c939b.tar.gz otp-965aabe043074edbeca06ee2083c06be731c939b.tar.bz2 otp-965aabe043074edbeca06ee2083c06be731c939b.zip | |
Merge branch 'sverker/erts/open_port-improper-args.ERL-127.OTP-13489'
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_bif_port.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bif_port.c b/erts/emulator/beam/erl_bif_port.c index 648f33744a..71b6d78094 100644 --- a/erts/emulator/beam/erl_bif_port.c +++ b/erts/emulator/beam/erl_bif_port.c @@ -985,6 +985,8 @@ static char **convert_args(Eterm l) } n = erts_list_length(l); + if (n < 0) + return NULL; /* We require at least one element in argv[0] + NULL at end */ pp = erts_alloc(ERTS_ALC_T_TMP, (n + 2) * sizeof(char **)); pp[i++] = erts_default_arg0; |