Terminate ssh error by zero character

knizhnik · gsmolk · commit d02fc64a14c5 · 2019-10-04T10:13:26.000+03:00
diff --git a/src/utils/file.c b/src/utils/file.c
@@ -55,10 +55,13 @@ void fio_error(int rc, int size, char const* file, int line)
 	}
 	else
 	{
-		char buf[PRINTF_BUF_SIZE];
-		int err_size = read(fio_stderr, buf, sizeof(buf));
+		char buf[PRINTF_BUF_SIZE+1];
+		int err_size = read(fio_stderr, buf, PRINTF_BUF_SIZE);
 		if (err_size > 0)
+		{
+			buf[err_size] = '\0';
 			elog(ERROR, "Agent error: %s", buf);
+		}
 		else
 			elog(ERROR, "Communication error: %s", rc >= 0 ? "end of data" :  strerror(errno));
 	}

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,13 @@ void fio_error(int rc, int size, char const* file, int line)`
`55`	`55`	`}`
`56`	`56`	`else`
`57`	`57`	`{`
`58`		`- char buf[PRINTF_BUF_SIZE];`
`59`		`- int err_size = read(fio_stderr, buf, sizeof(buf));`
	`58`	`+ char buf[PRINTF_BUF_SIZE+1];`
	`59`	`+ int err_size = read(fio_stderr, buf, PRINTF_BUF_SIZE);`
`60`	`60`	`if (err_size > 0)`
	`61`	`+ {`
	`62`	`+ buf[err_size] = '\0';`
`61`	`63`	`elog(ERROR, "Agent error: %s", buf);`
	`64`	`+ }`
`62`	`65`	`else`
`63`	`66`	`elog(ERROR, "Communication error: %s", rc >= 0 ? "end of data" : strerror(errno));`
`64`	`67`	`}`