diff options
| author | Sverker Eriksson <[email protected]> | 2017-06-29 14:42:49 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-06-29 14:42:49 +0200 |
| commit | 616a495f28783e05a95fd545c4a247f1a9177f81 (patch) | |
| tree | 0e9163d36fecad3b62ecfd3290fb72e05b86ea5d /erts/emulator/beam | |
| parent | 49bcc77de63c37ac6c0de5c14c57583f78610f48 (diff) | |
| parent | 86bcdcb3db79ac2d1faa387bbe194924e966dd69 (diff) | |
| download | otp-616a495f28783e05a95fd545c4a247f1a9177f81.tar.gz otp-616a495f28783e05a95fd545c4a247f1a9177f81.tar.bz2 otp-616a495f28783e05a95fd545c4a247f1a9177f81.zip | |
Merge branch 'sverker/erts/apply-badarg/ERL-432/OTP-14490' into maint
* sverker/erts/apply-badarg/ERL-432/OTP-14490:
erts: Make apply throw 'badarg' if Args is not a list
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/beam_emu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_emu.c b/erts/emulator/beam/beam_emu.c index 79d751d13e..bc83699951 100644 --- a/erts/emulator/beam/beam_emu.c +++ b/erts/emulator/beam/beam_emu.c @@ -6829,7 +6829,7 @@ apply_fun(Process* p, Eterm fun, Eterm args, Eterm* reg) } if (is_not_nil(tmp)) { /* Must be well-formed list */ - p->freason = EXC_UNDEF; + p->freason = EXC_BADARG; return NULL; } reg[arity] = fun; |