diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-01-18 14:01:21 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-01-18 14:01:21 +0000 |
| commit | 82423975df8b8de859c58e84a4248f4749cb8b16 (patch) | |
| tree | 2baed639932fc8a4937a7f7b0f81232f9e5d1155 /server-client.c | |
| parent | 66da51b6310baf408d805e0ec2f36f35bdb85339 (diff) | |
| parent | 0730dce5abf5e43f8e3820a1d4e8754e61874a3d (diff) | |
| download | rtmux-82423975df8b8de859c58e84a4248f4749cb8b16.tar.gz rtmux-82423975df8b8de859c58e84a4248f4749cb8b16.tar.bz2 rtmux-82423975df8b8de859c58e84a4248f4749cb8b16.zip | |
Merge branch 'obsd-master' into master
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server-client.c b/server-client.c index 75a5719c..c3342d6a 100644 --- a/server-client.c +++ b/server-client.c @@ -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) |