user/sven/git.git/read-cache.c, branch v1.7.7.4

read-cache.c: fix index memory allocation

2011-10-26T21:35:16Z

estimate_cache_size() tries to guess how much memory is needed for the in-memory representation of an index file. It does that by using the file size, the number of entries and the difference of the sizes of the on-disk and in-memory structs -- without having to check the length of the name of each entry, which varies for each entry, but their sums are the same no matter the representation. Except there can be a difference. First of all, the size is really calculated by ce_size and ondisk_ce_size based on offsetof(..., name), not sizeof, which can be different. And entries are padded with 1 to 8 NULs at the end (after the variable name) to make their total length a multiple of eight. So in order to allocate enough memory to hold the index, change the delta calculation to be based on offsetof(..., name) and round up to the next multiple of eight. On a 32-bit Linux, this delta was used before: sizeof(struct cache_entry) == 72 sizeof(struct ondisk_cache_entry) == 64 --- 8 The actual difference for an entry with a filename length of one was, however (find the definitions are in cache.h): offsetof(struct cache_entry, name) == 72 offsetof(struct ondisk_cache_entry, name) == 62 ce_size == (72 + 1 + 8) & ~7 == 80 ondisk_ce_size == (62 + 1 + 8) & ~7 == 64 --- 16 So eight bytes less had been allocated for such entries. The new formula yields the correct delta: (72 - 62 + 7) & ~7 == 16 Reported-by: John Hsing Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'maint'

2011-08-25T23:00:07Z

* maint: whitespace: have SP on both sides of an assignment "=" update-ref: whitespace fix

whitespace: have SP on both sides of an assignment "="

2011-08-25T21:47:07Z

I've deliberately excluded the borrowed code in compat/nedmalloc directory. Signed-off-by: Junio C Hamano

Merge branch 'ef/maint-win-verify-path'

2011-06-30T00:09:17Z

* ef/maint-win-verify-path: verify_dotfile(): do not assume '/' is the path seperator verify_path(): simplify check at the directory boundary verify_path: consider dos drive prefix real_path: do not assume '/' is the path seperator A Windows path starting with a backslash is absolute

verify_dotfile(): do not assume '/' is the path seperator

2011-06-08T23:34:38Z

verify_dotfile() currently assumes that the path seperator is '/', but on Windows it can also be '\\', so use is_dir_sep() instead. Signed-off-by: Theo Niessink Signed-off-by: Junio C Hamano

verify_path(): simplify check at the directory boundary

2011-06-07T19:22:51Z

We simply want to say "At a directory boundary, be careful with a name that begins with a dot, forbid a name that ends with the boundary character or has duplicated bounadry characters". Signed-off-by: Junio C Hamano

verify_path: consider dos drive prefix

2011-05-27T17:59:18Z

If someone manage to create a repo with a 'C:' entry in the root-tree, files can be written outside of the working-dir. This opens up a can-of-worms of exploits. Fix it by explicitly checking for a dos drive prefix when verifying a paht. While we're at it, make sure that paths beginning with '\' is considered absolute as well. Noticed-by: Theo Niessink Signed-off-by: Erik Faye-Lund Signed-off-by: Junio C Hamano

index_fd(): turn write_object and format_check arguments into one flag

2011-05-09T18:58:19Z

The "format_check" parameter tucked after the existing parameters is too ugly an afterthought to live in any reasonable API. Combine it with the other boolean parameter "write_object" into a single "flags" parameter. Signed-off-by: Junio C Hamano

Merge branch 'jc/index-update-if-able' into maint

2011-04-03T19:33:05Z

* jc/index-update-if-able: update $GIT_INDEX_FILE when there are racily clean entries diff/status: refactor opportunistic index update

Merge branch 'jc/index-update-if-able'

2011-03-27T03:13:16Z

* jc/index-update-if-able: update $GIT_INDEX_FILE when there are racily clean entries diff/status: refactor opportunistic index update