git/builtin/pack-objects.c, branch v2.15.2

cleanup: fix possible overflow errors in binary search

2017-10-09T23:57:24Z

A common mistake when writing binary search is to allow possible integer overflow by using the simple average: mid = (min + max) / 2; Instead, use the overflow-safe version: mid = min + (max - min) / 2; This translation is safe since the operation occurs inside a loop conditioned on "min < max". The included changes were found using the following git grep: git grep '/ *2;' '*.c' Making this cleanup will prevent future review friction when a new binary search is contructed based on existing code. Signed-off-by: Derrick Stolee Reviewed-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'rj/no-sign-compare'

2017-09-29T02:23:42Z

Many codepaths have been updated to squelch -Wsign-compare warnings. * rj/no-sign-compare: ALLOC_GROW: avoid -Wsign-compare warnings cache.h: hex2chr() - avoid -Wsign-compare warnings commit-slab.h: avoid -Wsign-compare warnings git-compat-util.h: xsize_t() - avoid -Wsign-compare warnings

ALLOC_GROW: avoid -Wsign-compare warnings

2017-09-22T04:21:11Z

Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano

pack: make packed_git_mru global a value instead of a pointer

2017-09-14T06:05:48Z

The MRU cache that keeps track of recently used packs is represented using two global variables: struct mru packed_git_mru_storage; struct mru *packed_git_mru = &packed_git_mru_storage; Callers never assign to the packed_git_mru pointer, though, so we can simplify by eliminating it and using &packed_git_mru_storage (renamed to &packed_git_mru) directly. This variable is only used by the packfile subsystem, making this a relatively uninvasive change (and any new unadapted callers would trigger a compile error). Noticed while moving these globals to the object_store struct. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder Acked-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'ma/ts-cleanups'

2017-09-10T08:08:22Z

Assorted bugfixes and clean-ups. * ma/ts-cleanups: ThreadSanitizer: add suppressions strbuf_setlen: don't write to strbuf_slopbuf pack-objects: take lock before accessing `remaining` convert: always initialize attr_action in convert_attrs

pack: move open_pack_index(), parse_pack_index()

2017-08-23T22:12:06Z

alloc_packed_git() in packfile.c is duplicated from sha1_file.c. In a subsequent commit, alloc_packed_git() will be removed from sha1_file.c. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano

Merge branch 'rs/pack-objects-pbase-cleanup' into maint

2017-08-23T21:33:48Z

Code clean-up. * rs/pack-objects-pbase-cleanup: pack-objects: remove unnecessary NULL check

pack-objects: take lock before accessing `remaining`

2017-08-23T17:14:19Z

When checking the conditional of "while (me->remaining)", we did not hold the lock. Calling find_deltas would still be safe, since it checks "remaining" (after taking the lock) and is able to handle all values. In fact, this could (currently) not trigger any bug: a bug could happen if `remaining` transitioning from zero to non-zero races with the evaluation of the while-condition, but these are always separated by the data_ready-mechanism. Make sure we have the lock when we read `remaining`. This does mean we release it just so that find_deltas can take it immediately again. We could tweak the contract so that the lock should be taken before calling find_deltas, but let's defer that until someone can actually show that "unlock+lock" has a measurable negative impact. Signed-off-by: Martin Ågren Signed-off-by: Junio C Hamano

Merge branch 'rs/pack-objects-pbase-cleanup'

2017-08-11T20:27:00Z

Code clean-up. * rs/pack-objects-pbase-cleanup: pack-objects: remove unnecessary NULL check

pack-objects: remove unnecessary NULL check

2017-07-20T21:50:20Z

If done_pbase_paths is NULL then done_pbase_paths_num must be zero and done_pbase_path_pos() returns -1 without accessing the array, so the check is not necessary. If the invariant was violated then the check would make sure we keep on going and allocate the necessary amount of memory in the next ALLOC_GROW call. That sounds nice, but all array entries except for one would contain garbage data. If the invariant was violated without the check we'd get a segfault in done_pbase_path_pos(), i.e. an observable crash, alerting us of the presence of a bug. Currently there is no such bug: Only the functions check_pbase_path() and cleanup_preferred_base() change pointer and counter, and both make sure to keep them in sync. Get rid of the check anyway to allow us to see if later changes introduce such a defect, and to simplify the code. Detected by Coverity Scan. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano