Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam
2021-01-18 14:01:21 +00:00
4 changed files with 28 additions and 34 deletions

View File

@ -1778,11 +1778,11 @@ server_client_check_exit(struct client *c)
switch (c->exit_type) {
case CLIENT_EXIT_RETURN:
if (c->exit_message != NULL) {
if (c->exit_message != NULL)
msize = strlen(c->exit_message) + 1;
size = (sizeof c->retval) + msize;
} else
size = (sizeof c->retval);
else
msize = 0;
size = (sizeof c->retval) + msize;
data = xmalloc(size);
memcpy(data, &c->retval, sizeof c->retval);
if (c->exit_message != NULL)