Explorar el Código

Ensure that we null terminate the process output buffer in run_external_process

Alex Smith hace 6 años
padre
commit
c49cd45e01
Se han modificado 1 ficheros con 4 adiciones y 1 borrados
  1. 4 1
      daemon/external-helper.c

+ 4 - 1
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;