[PATCH] hash_object: correction for zero length file
- From
Dmitry Potapov <dpotapov@gmail.com>
- Date
- May 10, 2010, 21:38 UTC
- Message-ID
- <20100510213817.GK14069@dpotapov.dyndns.org>
The check whether size is zero was done after if size <= SMALL_FILE_SIZE, as result, zero size case was never triggered. Instead zero length file was treated as any other small file. This did not caused any problem, but if we have a special case for size equal to zero, it is better to make it work and avoid redundant malloc().
Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> --- sha1_file.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c index 28c056e..2ece9b6 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2448,7 +2448,9 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, else ret = -1; strbuf_release(&sbuf); - } else if (size <= SMALL_FILE_SIZE) { + } else if (!size) + ret = index_mem(sha1, NULL, size, write_object, type, path); + else if (size <= SMALL_FILE_SIZE) { char *buf = xmalloc(size); if (size == read_in_full(fd, buf, size)) ret = index_mem(sha1, buf, size, write_object, type, @@ -2456,12 +2458,11 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, else ret = error("short read %s", strerror(errno)); free(buf); - } else if (size) { + } else { void *buf = xmmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); ret = index_mem(sha1, buf, size, write_object, type, path); munmap(buf, size); - } else - ret = index_mem(sha1, NULL, size, write_object, type, path); + } close(fd); return ret; }
-- 1.7.1.83.g11b7c