diff options
| author | Rys Sommefeldt | 2009-11-07 15:24:45 +0100 |
|---|---|---|
| committer | Lars Hjemli | 2009-11-07 15:34:18 +0100 |
| commit | 8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2 (patch) | |
| tree | 2b66d688de6ce2b7598cc78ea6ed812f2d5f882a | |
| parent | Nov is the correct abbreviation (diff) | |
| download | cgit-8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2.tar.gz cgit-8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2.zip | |
Close fd on error in readfile()
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| -rw-r--r-- | shared.c | 9 |
1 files changed, 7 insertions, 2 deletions
| diff --git a/shared.c b/shared.c index d7b2d5a..a27ab30 100644 --- a/shared.c +++ b/shared.c | |||
| @@ -406,12 +406,17 @@ int readfile(const char *path, char **buf, size_t *size) | |||
| 406 | fd = open(path, O_RDONLY); | 406 | fd = open(path, O_RDONLY); |
| 407 | if (fd == -1) | 407 | if (fd == -1) |
| 408 | return errno; | 408 | return errno; |
| 409 | if (fstat(fd, &st)) | 409 | if (fstat(fd, &st)) { |
| 410 | close(fd); | ||
| 410 | return errno; | 411 | return errno; |
| 411 | if (!S_ISREG(st.st_mode)) | 412 | } |
| 413 | if (!S_ISREG(st.st_mode)) { | ||
| 414 | close(fd); | ||
| 412 | return EISDIR; | 415 | return EISDIR; |
| 416 | } | ||
| 413 | *buf = xmalloc(st.st_size + 1); | 417 | *buf = xmalloc(st.st_size + 1); |
| 414 | *size = read_in_full(fd, *buf, st.st_size); | 418 | *size = read_in_full(fd, *buf, st.st_size); |
| 415 | (*buf)[*size] = '\0'; | 419 | (*buf)[*size] = '\0'; |
| 420 | close(fd); | ||
| 416 | return (*size == st.st_size ? 0 : errno); | 421 | return (*size == st.st_size ? 0 : errno); |
| 417 | } | 422 | } |