diff options
| author | Ingela Anderton Andin <[email protected]> | 2017-04-04 16:25:39 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2017-04-04 16:25:39 +0200 |
| commit | c04e4cd533d9a4185eadda3141e0783b0f5a0fae (patch) | |
| tree | fe4796bf3371069132cf591b7524ba48adf6a4cf /erts | |
| parent | 38cd77b3e7afbf3973167c5a339381707e3d95bc (diff) | |
| parent | d25ad84195ca42969fbfb017a52aab8c8effc246 (diff) | |
| download | otp-c04e4cd533d9a4185eadda3141e0783b0f5a0fae.tar.gz otp-c04e4cd533d9a4185eadda3141e0783b0f5a0fae.tar.bz2 otp-c04e4cd533d9a4185eadda3141e0783b0f5a0fae.zip | |
Merge branch 'maint-19' into maint
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/notes.xml | 31 | ||||
| -rw-r--r-- | erts/emulator/drivers/unix/unix_efile.c | 3 | ||||
| -rw-r--r-- | erts/vsn.mk | 2 |
3 files changed, 35 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 470491a193..d9c5f47a3a 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -32,6 +32,37 @@ <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 8.3.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Trying to open a directory with file:read_file/1 on Unix + leaked a file descriptor. This bug has now been fixed.</p> + <p> + Own Id: OTP-14308 Aux Id: ERL-383 </p> + </item> + </list> + </section> + + + <section><title>Known Bugs and Problems</title> + <list> + <item> + <p> + Invoking <c>init:stop/0</c> via the SIGTERM signal, in a + non-SMP BEAM, could cause BEAM to terminate with fatal + error. This has now been fixed and the BEAM will + terminate normally when SIGTERM is received.</p> + <p> + Own Id: OTP-14290</p> + </item> + </list> + </section> + +</section> + <section><title>Erts 8.3</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c index 3ff68a8859..0acc2432a7 100644 --- a/erts/emulator/drivers/unix/unix_efile.c +++ b/erts/emulator/drivers/unix/unix_efile.c @@ -430,6 +430,9 @@ efile_openfile(Efile_error* errInfo, /* Where to return error codes. */ if ( (stat("/dev/null", &nullstatbuf) < 0) || (statbuf.st_ino != nullstatbuf.st_ino) || (statbuf.st_dev != nullstatbuf.st_dev) ) { +#ifdef HAVE_FSTAT + efile_closefile(fd); +#endif errno = EISDIR; return check_error(-1, errInfo); } diff --git a/erts/vsn.mk b/erts/vsn.mk index ab39cb45ed..7f880dba49 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 8.3 +VSN = 8.3.1 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |