aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc/common
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-04-24 13:30:00 +0200
committerJohn Högberg <[email protected]>2018-04-24 14:20:06 +0200
commit05b1c13e36ec49891e89593b25e668e983a4fc41 (patch)
treec5c8474cfbf9516fe1818bbfb66757057bdfcb9b /erts/etc/common
parent74a95b3d511177a9b35c2b0272b9ca5511b6f750 (diff)
downloadotp-05b1c13e36ec49891e89593b25e668e983a4fc41.tar.gz
otp-05b1c13e36ec49891e89593b25e668e983a4fc41.tar.bz2
otp-05b1c13e36ec49891e89593b25e668e983a4fc41.zip
heart: Use ntohs instead of manual conversion
Multiplying a signed char by 256 is undefined behavior and caused problems on some platforms when the length was long enough. We could cast it to an unsigned int to make it work, but it's best not to reinvent the wheel. Fixes OTP-15034
Diffstat (limited to 'erts/etc/common')
-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 01ef840b5d..aaaffbca79 100644
--- a/erts/etc/common/heart.c
+++ b/erts/etc/common/heart.c
@@ -847,11 +847,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 *) */