mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-09 10:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Close fd on error in readfile()

Browse Source 
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Rys Sommefeldt 2009-11-07 15:24:45 +01:00 committed by Lars Hjemli
parent e34a3b5adc
commit 8cfe4897f0
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shared.c
View File

@ -406,12 +406,17 @@ int readfile(const char *path, char **buf, size_t *size)
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
if (fd == -1) if (fd == -1)
return errno; return errno;
if (fstat(fd, &st)) if (fstat(fd, &st)) {
close(fd);
return errno; return errno;
if (!S_ISREG(st.st_mode)) }
if (!S_ISREG(st.st_mode)) {
close(fd);
return EISDIR; return EISDIR;
}
*buf = xmalloc(st.st_size + 1); *buf = xmalloc(st.st_size + 1);
*size = read_in_full(fd, *buf, st.st_size); *size = read_in_full(fd, *buf, st.st_size);
(*buf)[*size] = '\0'; (*buf)[*size] = '\0';
close(fd);
return (*size == st.st_size ? 0 : errno); return (*size == st.st_size ? 0 : errno);
} }