From 740097a65ed5c92b3a5a23f0c919b82ea6a59625 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Wed, 13 Feb 2008 07:23:37 +0000 Subject: We were leaking a file descriptor if Tor started with a zero-length cached-descriptors file. Patch by freddy77; bugfix on 0.1.2. svn:r13488 --- src/common/compat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/common') diff --git a/src/common/compat.c b/src/common/compat.c index cc8350d4a..b1b18fa7a 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -129,6 +129,7 @@ typedef struct tor_mmap_impl_t { size_t mapping_size; /**< Size of the actual mapping. (This is this file * size, rounded up to the nearest page.) */ } tor_mmap_impl_t; + /** Try to create a memory mapping for filename and return it. On * failure, return NULL. Sets errno properly, using ERANGE to mean * "empty file". */ @@ -164,21 +165,20 @@ tor_mmap_file(const char *filename) * return NULL, and bad things will happen. So just fail. */ log_info(LD_FS,"File \"%s\" is empty. Ignoring.",filename); errno = ERANGE; + close(fd); return NULL; } string = mmap(0, size, PROT_READ, MAP_PRIVATE, fd, 0); + close(fd); if (string == MAP_FAILED) { int save_errno = errno; - close(fd); log_warn(LD_FS,"Could not mmap file \"%s\": %s", filename, strerror(errno)); errno = save_errno; return NULL; } - close(fd); - res = tor_malloc_zero(sizeof(tor_mmap_impl_t)); res->base.data = string; res->base.size = filesize; -- cgit v1.2.3