diff options
| author | Rys Sommefeldt <rys@pixeltards.com> | 2009-11-07 15:24:45 +0100 | 
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-11-07 15:34:18 +0100 | 
| commit | 8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2 (patch) | |
| tree | 2b66d688de6ce2b7598cc78ea6ed812f2d5f882a | |
| parent | e34a3b5adc00255f8acb7d674e5fdadef2ac80f7 (diff) | |
| download | cgit-8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2.tar.gz cgit-8cfe4897f01066ae901bdd6ef106faf8e8f2ddf2.tar.bz2 | |
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
| @@ -406,12 +406,17 @@ 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)) +	} +	if (!S_ISREG(st.st_mode)) { +		close(fd);  		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);  } | 
