diff options
| author | Lukas Larsson <[email protected]> | 2016-02-03 14:23:06 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-02-03 14:23:06 +0100 |
| commit | 0cf09adc86c87e8b25005c6c305cb419b050c344 (patch) | |
| tree | 285c5779f8d787e931848a687a1aab4bbbff0447 /erts/emulator | |
| parent | ad4bcbd3ce44f4935c55bf2aafcdfe0f748c6869 (diff) | |
| parent | e3d8f19dc43a54dcae9acc7a3803e41387fccc4d (diff) | |
| download | otp-0cf09adc86c87e8b25005c6c305cb419b050c344.tar.gz otp-0cf09adc86c87e8b25005c6c305cb419b050c344.tar.bz2 otp-0cf09adc86c87e8b25005c6c305cb419b050c344.zip | |
Merge branch 'maint'
* maint:
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 51b522c9e0..b53b662a59 100644 --- a/erts/emulator/beam/erl_alloc.c +++ b/erts/emulator/beam/erl_alloc.c @@ -1917,7 +1917,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; |