From c49cd45e0100d331d6403fccca65cc04255ad413 Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Sun, 10 Mar 2019 10:51:15 +0000 Subject: [PATCH] Ensure that we null terminate the process output buffer in run_external_process --- daemon/external-helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/daemon/external-helper.c b/daemon/external-helper.c index 4ed14dd..b915724 100644 --- a/daemon/external-helper.c +++ b/daemon/external-helper.c @@ -116,11 +116,14 @@ int run_external_process(const char *const *exec_args, char buffer[EXTERNAL_BUFF } close(pipes[1]); - if (read(pipes[0], internal, EXTERNAL_BUFFER_MAX) < 0) { + ssize_t output_size = read(pipes[0], internal, EXTERNAL_BUFFER_MAX - 1); + if (output_size < 0) { LOG_ERROR("Failed to read from process %s: %s\n", exec_args[0], strerror(errno)); return -1; } + internal[output_size] = 0; + if (waitpid(p, &status, 0) < 0) { LOG_ERROR("Failed to waitpid(%d): %s\n", (int)p, strerror(errno)); return -1;