aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorMichael Santos <[email protected]>2010-10-01 19:56:10 -0400
committerBjörn Gustavsson <[email protected]>2010-10-04 15:25:22 +0200
commit731755b6f865c3788b368ade7565e04d99ec83e8 (patch)
treee356d44ca4343ca0e110ca005722e5c8ecf45e40 /erts
parente5a231d5234fae86458fdb3a31701f9c09d3e16e (diff)
downloadotp-731755b6f865c3788b368ade7565e04d99ec83e8.tar.gz
otp-731755b6f865c3788b368ade7565e04d99ec83e8.tar.bz2
otp-731755b6f865c3788b368ade7565e04d99ec83e8.zip
heart: prevent buffer overflow
Diffstat (limited to 'erts')
-rw-r--r--erts/etc/common/heart.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/erts/etc/common/heart.c b/erts/etc/common/heart.c
index 4f738947b7..3e19e5f386 100644
--- a/erts/etc/common/heart.c
+++ b/erts/etc/common/heart.c
@@ -375,7 +375,8 @@ main(int argc, char **argv)
_setmode(erlin_fd,_O_BINARY);
_setmode(erlout_fd,_O_BINARY);
#endif
- strcpy(program_name, argv[0]);
+ strncpy(program_name, argv[0], sizeof(program_name));
+ program_name[sizeof(program_name)-1] = '\0';
notify_ack(erlout_fd);
cmd[0] = '\0';
do_terminate(message_loop(erlin_fd,erlout_fd));
@@ -728,7 +729,11 @@ heart_cmd_reply(int fd, char *s)
struct msg m;
int len = strlen(s) + 1; /* Include \0 */
- /* FIXME if s >= MSG_BODY_SIZE error */
+ /* if s >= MSG_BODY_SIZE, return a write
+ * failure immediately.
+ */
+ if (len > sizeof(m.fill))
+ return -1;
m.op = HEART_CMD;
m.len = htons(len + 2); /* Include Op */