diff options
| author | Lukas Larsson <[email protected]> | 2016-02-03 14:22:57 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-02-03 14:22:57 +0100 |
| commit | e3d8f19dc43a54dcae9acc7a3803e41387fccc4d (patch) | |
| tree | 0bdb8461de31e82450c962dc30e6262d14bdf3a5 /erts/emulator | |
| parent | 584f2170a3cb5b647f91b64d92fe46327322e119 (diff) | |
| parent | cd6903be0740db0c0061533cfb46729b43016316 (diff) | |
| download | otp-e3d8f19dc43a54dcae9acc7a3803e41387fccc4d.tar.gz otp-e3d8f19dc43a54dcae9acc7a3803e41387fccc4d.tar.bz2 otp-e3d8f19dc43a54dcae9acc7a3803e41387fccc4d.zip | |
Merge branch 'lukas/erts/enomem_no_abort/OTP-13292' into maint
* lukas/erts/enomem_no_abort/OTP-13292:
erts: When erts_alloc fails, the emulator no longer aborts
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/beam/erl_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c index c3f4fe5a63..2a97069ac2 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -1923,7 +1923,7 @@ erts_alc_fatal_error(int error, int func, ErtsAlcType_t n, ...) va_start(argp, n); size = va_arg(argp, Uint); va_end(argp); - erl_exit(1, + erl_exit(-1, "%s: Cannot %s %lu bytes of memory (of type \"%s\").\n", allctr_str, op, size, t_str); break; |