diff options
author | Micael Karlberg <[email protected]> | 2011-04-18 16:36:53 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-04-18 16:36:53 +0200 |
commit | 42ef7086abd717e7a428804fe387b782abab9827 (patch) | |
tree | b4e8bab2dc224ee0d71bd522fbd0bc36a2b69550 /erts/etc/common/heart.c | |
parent | 30a9f962d349f322f389ebc056e972f871e689a8 (diff) | |
parent | 9022ef27b8628ca680654d542b4d520426480c2d (diff) | |
download | otp-42ef7086abd717e7a428804fe387b782abab9827.tar.gz otp-42ef7086abd717e7a428804fe387b782abab9827.tar.bz2 otp-42ef7086abd717e7a428804fe387b782abab9827.zip |
Merge branch 'bmk/snmp/agent/multi_engine_id_for_traps/OTP-9119' into bmk/agent/extra_info_notification/OTP-9183
Conflicts:
lib/snmp/doc/src/notes.xml
lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'erts/etc/common/heart.c')
-rw-r--r-- | erts/etc/common/heart.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c index 778b3569c7..7a5746e630 100644 --- a/erts/etc/common/heart.c +++ b/erts/etc/common/heart.c @@ -727,16 +727,16 @@ static int heart_cmd_reply(int fd, char *s) { struct msg m; - int len = strlen(s) + 1; /* Include \0 */ + int len = strlen(s); /* if s >= MSG_BODY_SIZE, return a write * failure immediately. */ - if (len > sizeof(m.fill)) + if (len >= sizeof(m.fill)) return -1; m.op = HEART_CMD; - m.len = htons(len + 2); /* Include Op */ + m.len = htons(len + 1); /* Include Op */ strcpy((char*)m.fill, s); return write_message(fd, &m); |