diff options
| author | nicm <nicm> | 2013-10-10 12:13:56 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2013-10-10 12:13:56 +0000 |
| commit | 10c38436aae90c61e1b43ffdbd4d10d3eb95fd6a (patch) | |
| tree | 5e6aee13a8d8ac38a7a74c301249a4d5ad8fdcdc /server-fn.c | |
| parent | a0404b69026f420c8a1c35b6d017047f208cd322 (diff) | |
Similarly for MSG_COMMAND - allow full imsg limit not arbitrary 2048.
Diffstat (limited to 'server-fn.c')
| -rw-r--r-- | server-fn.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/server-fn.c b/server-fn.c index fb0eadd6..f6485b49 100644 --- a/server-fn.c +++ b/server-fn.c @@ -235,9 +235,7 @@ server_lock_session(struct session *s) void server_lock_client(struct client *c) { - const char *cmd; - size_t cmdlen; - struct msg_lock_data lockdata; + const char *cmd; if (c->flags & CLIENT_CONTROL) return; @@ -246,8 +244,7 @@ server_lock_client(struct client *c) return; cmd = options_get_string(&c->session->options, "lock-command"); - cmdlen = strlcpy(lockdata.cmd, cmd, sizeof lockdata.cmd); - if (cmdlen >= sizeof lockdata.cmd) + if (strlen(cmd) + 1 > MAX_IMSGSIZE - IMSG_HEADER_SIZE) return; tty_stop_tty(&c->tty); @@ -256,7 +253,7 @@ server_lock_client(struct client *c) tty_raw(&c->tty, tty_term_string(c->tty.term, TTYC_E3)); c->flags |= CLIENT_SUSPENDED; - server_write_client(c, MSG_LOCK, &lockdata, sizeof lockdata); + server_write_client(c, MSG_LOCK, cmd, strlen(cmd) + 1); } void |