diff options
author | John Högberg <[email protected]> | 2018-06-05 14:06:19 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2018-06-05 14:06:19 +0200 |
commit | 3836f8a1e757e6dff8316ab9938095b9611c75e6 (patch) | |
tree | 5f677921cffccfd0d5509e4c50baa50f530b5c62 /erts | |
parent | 1002dd0444bd43353f33b03ab8fb0f19e57465dd (diff) | |
parent | 5cb944bf32b7b3f4ec5500710fe10c28a643e1fd (diff) | |
download | otp-3836f8a1e757e6dff8316ab9938095b9611c75e6.tar.gz otp-3836f8a1e757e6dff8316ab9938095b9611c75e6.tar.bz2 otp-3836f8a1e757e6dff8316ab9938095b9611c75e6.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
inets: Gracefully handle bad headers
Diffstat (limited to 'erts')
-rw-r--r-- | erts/doc/src/notes.xml | 25 | ||||
-rw-r--r-- | erts/vsn.mk | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 929d569f16..f7f86084a9 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,31 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 9.3.2</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fixed bug in <c>enif_binary_to_term</c> which could cause + memory corruption for immediate terms (atoms, small + integers, pids, ports, empty lists).</p> + <p> + Own Id: OTP-15080</p> + </item> + <item> + <p> + Fixed bug in <c>erlang:system_profile/2</c> that could + cause superfluous <c>{profile,_,active,_,_}</c> messages + for terminating processes.</p> + <p> + Own Id: OTP-15085</p> + </item> + </list> + </section> + +</section> + <section><title>Erts 9.3.1</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/vsn.mk b/erts/vsn.mk index 25acd9cc34..687c62343e 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 9.3.1 +VSN = 9.3.2 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |