All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rys Sommefeldt <rys@pixeltards.com>
To: git@vger.kernel.org
Cc: hjemli@gmail.com, steven@uplinklabs.net
Subject: Re: [cgit PATCH] Close file descriptor on error in readfile()
Date: Sat, 07 Nov 2009 12:23:37 +0000	[thread overview]
Message-ID: <4AF566C9.5090106@pixeltards.com> (raw)
In-Reply-To: <4AF4D4EC.1040806@pixeltards.com>

All,

Sorry for the earlier HTML email, I'd misconfigured my mail client so 
accept my apologies for that (and thanks Steven).  Here's the reworked 
patch:

 From d928507bf4c8727c3848525f4744d7c8507de5e8 Mon Sep 17 00:00:00 2001
From: Rys Sommefeldt <rys@pixeltards.com>
Date: Sat, 7 Nov 2009 12:15:24 +0000
Subject: [PATCH] Close fd on error in readfile()

---
  shared.c |    5 ++++-
  1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/shared.c b/shared.c
index d7b2d5a..a676fa3 100644
--- a/shared.c
+++ b/shared.c
@@ -406,12 +406,15 @@ int readfile(const char *path, char **buf, size_t 
*size)
     fd = open(path, O_RDONLY);
     if (fd == -1)
         return errno;
-   if (fstat(fd, &st))
+   if (fstat(fd, &st)) {
+       close(fd);
         return errno;
+   }
     if (!S_ISREG(st.st_mode))
         return EISDIR;
     *buf = xmalloc(st.st_size + 1);
     *size = read_in_full(fd, *buf, st.st_size);
     (*buf)[*size] = '\0';
+   close(fd);
     return (*size == st.st_size ? 0 : errno);
  }
-- 
1.6.5.2

  parent reply	other threads:[~2009-11-07 12:23 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-07  2:01 [cgit PATCH] Close file descriptor on error in readfile() Rys Sommefeldt
2009-11-07  2:22 ` Steven Noonan
2009-11-07  2:26   ` Rys Sommefeldt
2009-11-07 12:23 ` Rys Sommefeldt [this message]
2009-11-07 14:59   ` Lars Hjemli
2009-11-07 16:14     ` Andreas Schwab
2009-11-07 17:15       ` Lars Hjemli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4AF566C9.5090106@pixeltards.com \
    --to=rys@pixeltards.com \
    --cc=git@vger.kernel.org \
    --cc=hjemli@gmail.com \
    --cc=steven@uplinklabs.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.