Commit Diff

Commit:
90e25b1fb888319a60c666995286e204ed5fe0ae
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
plug a memory leak in show_change(), line was leaked
Actions:
Patch | Tree
commit - c1c775ebf431921ec88711e07b197edd07e05bb5
commit + 90e25b1fb888319a60c666995286e204ed5fe0ae
blob - 473318fc731afd091ffa6dcf1c0a27f6c47cda82
blob + 891cb71dc53b1f68f72b2ad6206fc6dd3cc31c8c
--- got/got.c
+++ got/got.c
@@ -7481,6 +7481,7 @@ static const struct got_error *
 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
     int nchanges, const char *action)
 {
+	const struct got_error *err;
 	char *line = NULL;
 	size_t linesize = 0;
 	ssize_t linelen;
@@ -7498,8 +7499,12 @@ show_change(unsigned char status, const char *path, FI
 		printf(GOT_COMMIT_SEP_STR);
 		while ((linelen = getline(&line, &linesize, patch_file)) != -1)
 			printf("%s", line);
-		if (ferror(patch_file))
-			return got_error_from_errno("getline");
+		if (linelen == -1 && ferror(patch_file)) {
+			err = got_error_from_errno("getline");
+			free(line);
+			return err;
+		}
+		free(line);
 		printf(GOT_COMMIT_SEP_STR);
 		printf("M  %s (change %d of %d)\n%s this change? [y/n/q] ",
 		    path, n, nchanges, action);