diff options
| author | John Högberg <[email protected]> | 2018-05-03 08:13:58 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2018-05-03 08:13:58 +0200 |
| commit | 7588c6f850c59ef2fa338b38ac1cf141af4f69f2 (patch) | |
| tree | fb09c33a2e38eed82111a263b6ce595c67ef1b36 /erts | |
| parent | 6ab00dd854b70e0a4ad06fa802a5ebb1b4871721 (diff) | |
| parent | 26eea10dda1f316045e58e30a126feafe1843d3a (diff) | |
| download | otp-7588c6f850c59ef2fa338b38ac1cf141af4f69f2.tar.gz otp-7588c6f850c59ef2fa338b38ac1cf141af4f69f2.tar.bz2 otp-7588c6f850c59ef2fa338b38ac1cf141af4f69f2.zip | |
Merge branch 'maint'
* maint:
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 fcc7ec5b66..929d569f16 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 |