Merge branch 'jk/tighten-alloc' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:43 +0000 (11:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Mar 2016 19:13:43 +0000 (11:13 -0800)
* jk/tighten-alloc: (23 commits)
compat/mingw: brown paper bag fix for 50a6c8e
ewah: convert to REALLOC_ARRAY, etc
convert ewah/bitmap code to use xmalloc
diff_populate_gitlink: use a strbuf
transport_anonymize_url: use xstrfmt
git-compat-util: drop mempcpy compat code
sequencer: simplify memory allocation of get_message
test-path-utils: fix normalize_path_copy output buffer size
fetch-pack: simplify add_sought_entry
fast-import: simplify allocation in start_packfile
write_untracked_extension: use FLEX_ALLOC helper
prepare_{git,shell}_cmd: use argv_array
use st_add and st_mult for allocation size computation
convert trivial cases to FLEX_ARRAY macros
use xmallocz to avoid size arithmetic
convert trivial cases to ALLOC_ARRAY
convert manual allocations to argv_array
argv-array: add detach function
add helpers for allocating flex-array structs
harden REALLOC_ARRAY and xcalloc against size_t overflow
...

12 files changed:
1  2 
builtin/blame.c
builtin/grep.c
cache-tree.c
config.c
diff.c
diff.h
remote-curl.c
remote.c
run-command.c
setup.c
sha1_name.c
submodule.c
diff --cc builtin/blame.c
Simple merge
diff --cc builtin/grep.c
Simple merge
diff --cc cache-tree.c
Simple merge
diff --cc config.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge
diff --cc remote-curl.c
Simple merge
diff --cc remote.c
Simple merge
diff --cc run-command.c
Simple merge
diff --cc setup.c
Simple merge
diff --cc sha1_name.c
Simple merge
diff --cc submodule.c
Simple merge