close pipe before failure check, limit scanf length (#78)

Jan200101 · web-flow · commit db468f102536 · 2022-01-07T20:37:47.000Z
diff --git a/src/fetch.c b/src/fetch.c
@@ -54,12 +54,12 @@ char *pipeRead(const char *exec)
 	if (pipe == NULL)
 		return NULL;
 	char *returnVal = malloc(256);
-	const int scanf_return = fscanf(pipe, "%[^\n]s", returnVal);
+	const int scanf_return = fscanf(pipe, "%[^\n]256s", returnVal);
+	pclose(pipe);
 	if (scanf_return == EOF) {
 		fprintf(stderr, "ERROR: scanf failed!\n");
 		exit(EXIT_FAILURE);
 	}
-	pclose(pipe);
 	return returnVal;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,12 @@ char pipeRead(const char exec)`
`54`	`54`	`if (pipe == NULL)`
`55`	`55`	`return NULL;`
`56`	`56`	`char *returnVal = malloc(256);`
`57`		`- const int scanf_return = fscanf(pipe, "%[^\n]s", returnVal);`
	`57`	`+ const int scanf_return = fscanf(pipe, "%[^\n]256s", returnVal);`
	`58`	`+ pclose(pipe);`
`58`	`59`	`if (scanf_return == EOF) {`
`59`	`60`	`fprintf(stderr, "ERROR: scanf failed!\n");`
`60`	`61`	`exit(EXIT_FAILURE);`
`61`	`62`	`}`
`62`		`- pclose(pipe);`
`63`	`63`	`return returnVal;`
`64`	`64`	`}`
`65`	`65`