diff options
| author | Jim Meyering <jim@meyering.net> | 2011-05-26 13:54:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 18:07:52 (GMT) |
| commit | 5743350f696745a48dfe7976c98dc8eb5c842d72 (patch) | |
| tree | 25de41a88ebaa9217b2493d1b0eca7aa88ef8acb /git-mergetool.sh | |
| parent | bac9c06ba093d9254cb2ab3eed074722a3e635a6 (diff) | |
| download | git-5743350f696745a48dfe7976c98dc8eb5c842d72.zip git-5743350f696745a48dfe7976c98dc8eb5c842d72.tar.gz git-5743350f696745a48dfe7976c98dc8eb5c842d72.tar.bz2 | |
rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
If we reach EOF after the SHA1-then-TAB, yet before the NUL that
terminates each file name, we would fill the file name buffer with \255
bytes resulting from the repeatedly-failing fgetc (returns EOF/-1) and
ultimately complain about "filename too long", because no NUL was
encountered.
Signed-off-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions