diff options
| author | John Högberg <[email protected]> | 2018-05-03 08:13:19 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-05-03 08:13:19 +0200 |
| commit | 26eea10dda1f316045e58e30a126feafe1843d3a (patch) | |
| tree | 2908bab3b070a1e1c767c6fa038520f41834c6b8 /erts | |
| parent | 0de7634ca20ff7d8dec143b92130cd04025557fc (diff) | |
| parent | b5b627ded69445c06e8fbe34cda3421854c5582e (diff) | |
| download | otp-26eea10dda1f316045e58e30a126feafe1843d3a.tar.gz otp-26eea10dda1f316045e58e30a126feafe1843d3a.tar.bz2 otp-26eea10dda1f316045e58e30a126feafe1843d3a.zip | |
Merge branch 'maint-20' into maint
* maint-20:
Updated OTP version
Update release notes
Update version numbers
ssl: Prepare for release
ssl: Proper handling of clients that choose to send an empty answer to a certificate request
heart: Use ntohs instead of manual conversion
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/doc/src/notes.xml | 15 | ||||
| -rw-r--r-- | erts/etc/common/heart.c | 5 | ||||
| -rw-r--r-- | erts/vsn.mk | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml index 21168eee23..8bd8e6c7b8 100644 --- a/erts/doc/src/notes.xml +++ b/erts/doc/src/notes.xml @@ -31,6 +31,21 @@ </header> <p>This document describes the changes made to the ERTS application.</p> +<section><title>Erts 9.3.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p>Fixed a crash in <c>heart:get_cmd/0</c> when the + stored command was too long.</p> + <p> + Own Id: OTP-15034</p> + </item> + </list> + </section> + +</section> + <section><title>Erts 9.3</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c index bc353e384e..8f1e89b638 100644 --- a/erts/etc/common/heart.c +++ b/erts/etc/common/heart.c @@ -825,11 +825,8 @@ write_message(fd, mp) int fd; struct msg *mp; { - int len; - char* tmp; + int len = ntohs(mp->len); - tmp = (char*) &(mp->len); - len = (*tmp * 256) + *(tmp+1); if ((len == 0) || (len > MSG_BODY_SIZE)) { return MSG_HDR_SIZE; } /* cc68k wants (char *) */ diff --git a/erts/vsn.mk b/erts/vsn.mk index c3a62a5535..25acd9cc34 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 9.3 +VSN = 9.3.1 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |