author | Junio C Hamano <gitster@pobox.com> | |
Thu, 6 Sep 2007 04:58:40 +0000 (21:58 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 6 Sep 2007 04:58:40 +0000 (21:58 -0700) | ||
commit | 6b763c424e4ace1678ade5310f3ca3ffbd11af2c | |
tree | 9d2f03dd6ec094653b82ea06e3f3ad7228ca7f42 | tree | snapshot |
parent | 5587cac28be66acf5edc2a4b83b67c8cfffbc5e9 | commit | diff |
git-apply: do not read past the end of buffer
When the preimage we are patching is shorter than what the patch
text expects, we tried to match the buffer contents at the
"original" line with the fragment in full, without checking we
have enough data to match in the preimage. This caused the size
of a later memmove() to wrap around and attempt to scribble
almost the entire address space. Not good.
The code that follows the part this patch touches tries to match
the fragment with line offsets. Curiously, that code does not
have the problem --- it guards against reading past the end of
the preimage.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When the preimage we are patching is shorter than what the patch
text expects, we tried to match the buffer contents at the
"original" line with the fragment in full, without checking we
have enough data to match in the preimage. This caused the size
of a later memmove() to wrap around and attempt to scribble
almost the entire address space. Not good.
The code that follows the part this patch touches tries to match
the fragment with line offsets. Curiously, that code does not
have the problem --- it guards against reading past the end of
the preimage.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-apply.c | diff | blob | history | |
t/t4123-apply-shrink.sh | [new file with mode: 0755] | blob |