aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-05-03 08:13:19 +0200
committerJohn Högberg <[email protected]>2018-05-03 08:13:19 +0200
commit26eea10dda1f316045e58e30a126feafe1843d3a (patch)
tree2908bab3b070a1e1c767c6fa038520f41834c6b8 /erts/etc
parent0de7634ca20ff7d8dec143b92130cd04025557fc (diff)
parentb5b627ded69445c06e8fbe34cda3421854c5582e (diff)
downloadotp-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/etc')
-rw-r--r--erts/etc/common/heart.c5
1 files changed, 1 insertions, 4 deletions
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 *) */