aboutsummaryrefslogtreecommitdiffstats
path: root/src/uri
diff options
context:
space:
mode:
Diffstat (limited to 'src/uri')
-rw-r--r--src/uri/sock_test_server.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/uri/sock_test_server.c b/src/uri/sock_test_server.c
index 29adea2574a..35046aa061b 100644
--- a/src/uri/sock_test_server.c
+++ b/src/uri/sock_test_server.c
@@ -514,7 +514,7 @@ main (int argc, char **argv)
continue;
}
- else if (((char *) conn->buf)[0] != 0)
+ else if (isascii (conn->buf[0]))
{
// If it looks vaguely like a string, make sure it's terminated
((char *) conn->buf)[rx_bytes <
@@ -536,8 +536,12 @@ main (int argc, char **argv)
continue;
}
- if (isascii (conn->buf[0]) && strlen ((const char *) conn->buf))
+ if (isascii (conn->buf[0]))
{
+ // If it looks vaguely like a string, make sure it's terminated
+ ((char *) conn->buf)[rx_bytes <
+ conn->buf_size ? rx_bytes :
+ conn->buf_size - 1] = 0;
if (xtra)
fprintf (stderr,
"ERROR: FIFO not drained in previous test!\n"