summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-10-17 19:23:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-10-18 23:10:55 (GMT)
commit9e5f5d4cfea5bb7706f1f8bb07795d52d37a59fe (patch)
tree9b82c97bec2fd89fd64449af23589cd5a2b7cead /builtin/merge-file.c
parent352953a556e7f8d720e26a32d4aabbf823d3c4d4 (diff)
downloadgit-9e5f5d4cfea5bb7706f1f8bb07795d52d37a59fe.zip
git-9e5f5d4cfea5bb7706f1f8bb07795d52d37a59fe.tar.gz
git-9e5f5d4cfea5bb7706f1f8bb07795d52d37a59fe.tar.bz2
prefix_filename(): safely handle the case where pfx_len=0
Current prefix_filename() is proofed against the case where the prefix 'pfx' is NULL or a 0-length string, _except on Windows_. Change the behaviour to work the same on both platforms, and only check pfx_len so that callers passing a NULL prefix with a nonzero pfx_len segfault early on both. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions