diff options
| author | Guillaume Nault <g.nault@alphalink.fr> | 2012-12-10 13:29:18 +0100 |
|---|---|---|
| committer | Kozlov Dmitry <xeb@mail.ru> | 2012-12-14 20:50:01 +0400 |
| commit | 9e07dd71679b93852528efb41ac51ec2423f394b (patch) | |
| tree | 238dd25b016d2c3fba68341af292c5c491e5acf6 | |
| parent | 5195e2c34c33cc81fb4ca1995decf1b7dc863aab (diff) | |
| download | accel-ppp-9e07dd71679b93852528efb41ac51ec2423f394b.tar.gz accel-ppp-9e07dd71679b93852528efb41ac51ec2423f394b.zip | |
cli, tcp: Fix non-NULL terminated string reception
NULL terminate commands received in cln_read(). This ensures that the
processing loop can safely call strchr(), or any other string handling
functions.
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
| -rw-r--r-- | accel-pppd/cli/tcp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/accel-pppd/cli/tcp.c b/accel-pppd/cli/tcp.c index da28ff72..48fa01a2 100644 --- a/accel-pppd/cli/tcp.c +++ b/accel-pppd/cli/tcp.c @@ -144,7 +144,7 @@ static int cln_read(struct triton_md_handler_t *h) char *d; while (1) { - n = read(h->fd, cln->cmdline + cln->recv_pos, RECV_BUF_SIZE - cln->recv_pos); + n = read(h->fd, cln->cmdline + cln->recv_pos, RECV_BUF_SIZE - 1 - cln->recv_pos); if (n == 0) break; if (n < 0) { @@ -154,11 +154,12 @@ static int cln_read(struct triton_md_handler_t *h) } cln->recv_pos += n; - + cln->cmdline[cln->recv_pos] = '\0'; + while (cln->recv_pos) { d = strchr((char *)cln->cmdline, '\n'); if (!d) { - if (cln->recv_pos == RECV_BUF_SIZE) { + if (cln->recv_pos == RECV_BUF_SIZE - 1) { log_warn("cli: tcp: recv buffer overflow\n"); goto drop; } |