mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pw/apply-too-large'

Browse Source 
"git apply" punts when it is fed too large a patch input; the error
message it gives when it happens has been clarified.

* pw/apply-too-large:
  apply: improve error messages when reading patch
This commit is contained in:
Junio C Hamano
2023-07-06 11:54:47 -07:00
parent a9cc3b8fc7 42612e18d2
commit 84b889bd03
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apply.c
View File

@ -414,9 +414,10 @@ static void say_patch_name(FILE *output, const char *fmt, struct patch *patch)
static int read_patch_file(struct strbuf *sb, int fd)
{
if (strbuf_read(sb, fd, 0) < 0 || sb->len >= MAX_APPLY_SIZE)
return error_errno("git apply: failed to read");
if (strbuf_read(sb, fd, 0) < 0)
return error_errno(_("failed to read patch"));
else if (sb->len >= MAX_APPLY_SIZE)
return error(_("patch too large"));
/*
* Make sure that we have some slop in the buffer
* so that we can do speculative "memcmp" etc, and