git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 4/6] git-local-fetch: Avoid calling close(-1)

From
Sergey Vlasov <vsu@altlinux.ru>
Date
Sep 23, 2005, 12:28 UTC
Message-ID
<20050923122828.43796E010FC@center4.mivlgu.local>
In-Reply-To
<20050923122754.GB2197@master.mivlgu.local>

After open() failure, copy_file() called close(ifd) with ifd == -1 (harmless, but causes Valgrind noise). The same thing was possible for the destination file descriptor.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
---
 local-fetch.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
bb38750b6016dcd8dc71b2cd0a3bdef035f6508d
diff --git a/local-fetch.c b/local-fetch.c
--- a/local-fetch.c
+++ b/local-fetch.c
@@ -75,7 +75,8 @@ static int copy_file(const char *source,
 		void *map;
 		ifd = open(source, O_RDONLY);
 		if (ifd < 0 || fstat(ifd, &st) < 0) {
-			close(ifd);
+			if (ifd >= 0)
+				close(ifd);
 			fprintf(stderr, "cannot open %s\n", source);
 			return -1;
 		}
@@ -89,7 +90,8 @@ static int copy_file(const char *source,
 		status = ((ofd < 0) ||
 			  (write(ofd, map, st.st_size) != st.st_size));
 		munmap(map, st.st_size);
-		close(ofd);
+		if (ofd >= 0)
+			close(ofd);
 		if (status)
 			fprintf(stderr, "cannot write %s\n", dest);
 		else
Previous: Sergey VlasovNext: Sergey Vlasov
Message 5 of 7 in “More fetch fixes”
  1. 0/6 More fetch fixesSergey Vlasov, Sep 23, 2005
  2. 1/6 fetch.c: Do not build object ref listsSergey Vlasov, Sep 23, 2005
  3. 2/6 fetch.c: Plug memory leak in process_tree()Sergey Vlasov, Sep 23, 2005
  4. 3/6 git-local-fetch: Fix error checking and leak in setup_indices()Sergey Vlasov, Sep 23, 2005
  5. 4/6 git-local-fetch: Avoid calling close(-1)Sergey Vlasov, Sep 23, 2005
  6. 5/6 Fix "git-local-fetch -s" with packed source repositorySergey Vlasov, Sep 23, 2005
  7. 6/6 git-local-fetch: Avoid confusing error messages on packed repositoriesSergey Vlasov, Sep 23, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.