summaryrefslogtreecommitdiff
path: root/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-10-03 16:34:17 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-10 13:52:36 -0700
commit670c359da357639f9f9a814ed646b4d854ec5d55 (patch)
tree033496a3a221c61b1aceaf76133110dd3d908518 /contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
parentt5613: clarify "too deep" recursion tests (diff)
downloadtgif-670c359da357639f9f9a814ed646b4d854ec5d55.tar.xz
link_alt_odb_entry: handle normalize_path errors
When we add a new alternate to the list, we try to normalize out any redundant "..", etc. However, we do not look at the return value of normalize_path_copy(), and will happily continue with a path that could not be normalized. Worse, the normalizing process is done in-place, so we are left with whatever half-finished working state the normalizing function was in. Fortunately, this cannot cause us to read past the end of our buffer, as that working state will always leave the NUL from the original path in place. And we do tend to notice problems when we check is_directory() on the path. But you can see the nonsense that we feed to is_directory with an entry like: this/../../is/../../way/../../too/../../deep/../../to/../../resolve in your objects/info/alternates, which yields: error: object directory /to/e/deep/too/way//ects/this/../../is/../../way/../../too/../../deep/../../to/../../resolve does not exist; check .git/objects/info/alternates. We can easily fix this just by checking the return value. But that makes it hard to generate a good error message, since we're normalizing in-place and our input value has been overwritten by cruft. Instead, let's provide a strbuf helper that does an in-place normalize, but restores the original contents on error. This uses a second buffer under the hood, which is slightly less efficient, but this is not a performance-critical code path. The strbuf helper can also properly set the "len" parameter of the strbuf before returning. Just doing: normalize_path_copy(buf.buf, buf.buf); will shorten the string, but leave buf.len at the original length. That may be confusing to later code which uses the strbuf. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh')
0 files changed, 0 insertions, 0 deletions