git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-10 08:22:54 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'jw/apply-corrupt-location' into next

Browse Source 
"git apply" now reports the name of the input file along with the
line number when it encounters a corrupt patch, and correctly
resets the line counter when processing multiple patch files.

* jw/apply-corrupt-location:
  apply: report input location in binary and garbage patch errors
  apply: report input location in header parsing errors
  apply: report the location of corrupt patches
This commit is contained in:
Junio C Hamano
2026-03-23 10:03:57 -07:00
parent aef5881109 2ef795b027
commit 18e9b8f91f
7 changed files with 185 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
apply.c
View File

@@ -42,6 +42,7 @@
struct gitdiff_data {
struct strbuf *root;
const char *patch_input_file;
int linenr;
int p_value;
};
@@ -900,7 +901,8 @@ static int parse_traditional_patch(struct apply_state *state,
}
}
if (!name)
return error(_("unable to find filename in patch at line %d"), state->linenr);
return error(_("unable to find filename in patch at %s:%d"),
state->patch_input_file, state->linenr);
return 0;
}
@@ -937,20 +939,35 @@ static int gitdiff_verify_name(struct gitdiff_data *state,
if (*name) {
char *another;
if (isnull)
if (isnull) {
if (state->patch_input_file)
return error(_("git apply: bad git-diff - expected /dev/null, got %s at %s:%d"),
*name, state->patch_input_file, state->linenr);
return error(_("git apply: bad git-diff - expected /dev/null, got %s on line %d"),
*name, state->linenr);
}
another = find_name(state->root, line, NULL, state->p_value, TERM_TAB);
if (!another || strcmp(another, *name)) {
free(another);
if (state->patch_input_file)
return error((side == DIFF_NEW_NAME) ?
_("git apply: bad git-diff - inconsistent new filename at %s:%d") :
_("git apply: bad git-diff - inconsistent old filename at %s:%d"),
state->patch_input_file, state->linenr);
return error((side == DIFF_NEW_NAME) ?
_("git apply: bad git-diff - inconsistent new filename on line %d") :
_("git apply: bad git-diff - inconsistent old filename on line %d"), state->linenr);
_("git apply: bad git-diff - inconsistent new filename on line %d") :
_("git apply: bad git-diff - inconsistent old filename on line %d"),
state->linenr);
}
free(another);
} else {
if (!is_dev_null(line))
return error(_("git apply: bad git-diff - expected /dev/null on line %d"), state->linenr);
if (!is_dev_null(line)) {
if (state->patch_input_file)
return error(_("git apply: bad git-diff - expected /dev/null at %s:%d"),
state->patch_input_file, state->linenr);
return error(_("git apply: bad git-diff - expected /dev/null on line %d"),
state->linenr);
}
}
return 0;
@@ -974,12 +991,19 @@ static int gitdiff_newname(struct gitdiff_data *state,
DIFF_NEW_NAME);
}
static int parse_mode_line(const char *line, int linenr, unsigned int *mode)
static int parse_mode_line(const char *line,
const char *patch_input_file,
int linenr,
unsigned int *mode)
{
char *end;
*mode = strtoul(line, &end, 8);
if (end == line || !isspace(*end))
if (end == line || !isspace(*end)) {
if (patch_input_file)
return error(_("invalid mode at %s:%d: %s"),
patch_input_file, linenr, line);
return error(_("invalid mode on line %d: %s"), linenr, line);
}
*mode = canon_mode(*mode);
return 0;
}
@@ -988,14 +1012,16 @@ static int gitdiff_oldmode(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
return parse_mode_line(line, state->linenr, &patch->old_mode);
return parse_mode_line(line, state->patch_input_file, state->linenr,
&patch->old_mode);
}
static int gitdiff_newmode(struct gitdiff_data *state,
const char *line,
struct patch *patch)
{
return parse_mode_line(line, state->linenr, &patch->new_mode);
return parse_mode_line(line, state->patch_input_file, state->linenr,
&patch->new_mode);
}
static int gitdiff_delete(struct gitdiff_data *state,
@@ -1314,6 +1340,7 @@ static int check_header_line(int linenr, struct patch *patch)
}
int parse_git_diff_header(struct strbuf *root,
const char *patch_input_file,
int *linenr,
int p_value,
const char *line,
@@ -1345,6 +1372,7 @@ int parse_git_diff_header(struct strbuf *root,
size -= len;
(*linenr)++;
parse_hdr_state.root = root;
parse_hdr_state.patch_input_file = patch_input_file;
parse_hdr_state.linenr = *linenr;
parse_hdr_state.p_value = p_value;
@@ -1382,6 +1410,7 @@ int parse_git_diff_header(struct strbuf *root,
int res;
if (len < oplen || memcmp(p->str, line, oplen))
continue;
parse_hdr_state.linenr = *linenr;
res = p->fn(&parse_hdr_state, line + oplen, patch);
if (res < 0)
return -1;
@@ -1396,12 +1425,20 @@ int parse_git_diff_header(struct strbuf *root,
done:
if (!patch->old_name && !patch->new_name) {
if (!patch->def_name) {
error(Q_("git diff header lacks filename information when removing "
"%d leading pathname component (line %d)",
"git diff header lacks filename information when removing "
"%d leading pathname components (line %d)",
parse_hdr_state.p_value),
parse_hdr_state.p_value, *linenr);
if (patch_input_file)
error(Q_("git diff header lacks filename information when removing "
"%d leading pathname component at %s:%d",
"git diff header lacks filename information when removing "
"%d leading pathname components at %s:%d",
parse_hdr_state.p_value),
parse_hdr_state.p_value, patch_input_file, *linenr);
else
error(Q_("git diff header lacks filename information when removing "
"%d leading pathname component (line %d)",
"git diff header lacks filename information when removing "
"%d leading pathname components (line %d)",
parse_hdr_state.p_value),
parse_hdr_state.p_value, *linenr);
return -128;
}
patch->old_name = xstrdup(patch->def_name);
@@ -1409,8 +1446,12 @@ done:
}
if ((!patch->new_name && !patch->is_delete) ||
(!patch->old_name && !patch->is_new)) {
error(_("git diff header lacks filename information "
"(line %d)"), *linenr);
if (patch_input_file)
error(_("git diff header lacks filename information at %s:%d"),
patch_input_file, *linenr);
else
error(_("git diff header lacks filename information (line %d)"),
*linenr);
return -128;
}
patch->is_toplevel_relative = 1;
@@ -1577,8 +1618,9 @@ static int find_header(struct apply_state *state,
struct fragment dummy;
if (parse_fragment_header(line, len, &dummy) < 0)
continue;
error(_("patch fragment without header at line %d: %.*s"),
state->linenr, (int)len-1, line);
error(_("patch fragment without header at %s:%d: %.*s"),
state->patch_input_file, state->linenr,
(int)len-1, line);
return -128;
}
@@ -1590,7 +1632,9 @@ static int find_header(struct apply_state *state,
* or mode change, so we handle that specially
*/
if (!memcmp("diff --git ", line, 11)) {
int git_hdr_len = parse_git_diff_header(&state->root, &state->linenr,
int git_hdr_len = parse_git_diff_header(&state->root,
state->patch_input_file,
&state->linenr,
state->p_value, line, len,
size, patch);
if (git_hdr_len < 0)
@@ -1875,7 +1919,8 @@ static int parse_single_patch(struct apply_state *state,
len = parse_fragment(state, line, size, patch, fragment);
if (len <= 0) {
free(fragment);
return error(_("corrupt patch at line %d"), state->linenr);
return error(_("corrupt patch at %s:%d"),
state->patch_input_file, state->linenr);
}
fragment->patch = line;
fragment->size = len;
@@ -2065,8 +2110,8 @@ static struct fragment *parse_binary_hunk(struct apply_state *state,
corrupt:
free(data);
*status_p = -1;
error(_("corrupt binary patch at line %d: %.*s"),
state->linenr-1, llen-1, buffer);
error(_("corrupt binary patch at %s:%d: %.*s"),
state->patch_input_file, state->linenr-1, llen-1, buffer);
return NULL;
}
@@ -2102,7 +2147,8 @@ static int parse_binary(struct apply_state *state,
forward = parse_binary_hunk(state, &buffer, &size, &status, &used);
if (!forward && !status)
/* there has to be one hunk (forward hunk) */
return error(_("unrecognized binary patch at line %d"), state->linenr-1);
return error(_("unrecognized binary patch at %s:%d"),
state->patch_input_file, state->linenr-1);
if (status)
/* otherwise we already gave an error message */
return status;
@@ -2264,7 +2310,8 @@ static int parse_chunk(struct apply_state *state, char *buffer, unsigned long si
*/
if ((state->apply || state->check) &&
(!patch->is_binary && !metadata_changes(patch))) {
error(_("patch with only garbage at line %d"), state->linenr);
error(_("patch with only garbage at %s:%d"),
state->patch_input_file, state->linenr);
return -128;
}
}
@@ -4825,6 +4872,7 @@ static int apply_patch(struct apply_state *state,
int flush_attributes = 0;
state->patch_input_file = filename;
state->linenr = 1;
if (read_patch_file(&buf, fd) < 0)
return -128;
offset = 0;

1
apply.h
View File

@@ -167,6 +167,7 @@ int check_apply_state(struct apply_state *state, int force_apply);
* Returns -1 on failure, the length of the parsed header otherwise.
*/
int parse_git_diff_header(struct strbuf *root,
const char *patch_input_file,
int *linenr,
int p_value,
const char *line,

2
range-diff.c
View File

@@ -140,7 +140,7 @@ static int read_patches(const char *range, struct string_list *list,
if (eol)
*eol = '\n';
orig_len = len;
len = parse_git_diff_header(&root, &linenr, 0, line,
len = parse_git_diff_header(&root, NULL, &linenr, 0, line,
len, size, &patch);
if (len < 0) {
error(_("could not parse git header '%.*s'"),

4
t/t4012-diff-binary.sh
View File

@@ -68,7 +68,7 @@ test_expect_success 'apply detecting corrupt patch correctly' '
sed -e "s/-CIT/xCIT/" <output >broken &&
test_must_fail git apply --stat --summary broken 2>detected &&
detected=$(cat detected) &&
detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
detected=$(expr "$detected" : "error.*broken:\\([0-9]*\\)\$") &&
detected=$(sed -ne "${detected}p" broken) &&
test "$detected" = xCIT
'
@@ -77,7 +77,7 @@ test_expect_success 'apply detecting corrupt patch correctly' '
git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
test_must_fail git apply --stat --summary broken 2>detected &&
detected=$(cat detected) &&
detected=$(expr "$detected" : "error.*at line \\([0-9]*\\)\$") &&
detected=$(expr "$detected" : "error.*broken:\\([0-9]*\\)\$") &&
detected=$(sed -ne "${detected}p" broken) &&
test "$detected" = xCIT
'

88
t/t4100-apply-stat.sh
View File

@@ -48,7 +48,93 @@ test_expect_success 'applying a hunk header which overflows fails' '
+b
EOF
test_must_fail git apply patch 2>err &&
echo "error: corrupt patch at line 4" >expect &&
echo "error: corrupt patch at patch:4" >expect &&
test_cmp expect err
'
test_expect_success 'applying a hunk header which overflows from stdin fails' '
cat >patch <<-\EOF &&
diff -u a/file b/file
--- a/file
+++ b/file
@@ -98765432109876543210 +98765432109876543210 @@
-a
+b
EOF
test_must_fail git apply <patch 2>err &&
echo "error: corrupt patch at <stdin>:4" >expect &&
test_cmp expect err
'
test_expect_success 'applying multiple patches reports the corrupted input' '
cat >good.patch <<-\EOF &&
diff -u a/file b/file
--- a/file
+++ b/file
@@ -1 +1 @@
-a
+b
EOF
cat >bad.patch <<-\EOF &&
diff -u a/file b/file
--- a/file
+++ b/file
@@ -98765432109876543210 +98765432109876543210 @@
-a
+b
EOF
test_must_fail git apply --stat --summary good.patch bad.patch 2>err &&
echo "error: corrupt patch at bad.patch:4" >expect &&
test_cmp expect err
'
test_expect_success 'applying a patch without a header reports the input' '
cat >fragment.patch <<-\EOF &&
@@ -1 +1 @@
-a
+b
EOF
test_must_fail git apply fragment.patch 2>err &&
echo "error: patch fragment without header at fragment.patch:1: @@ -1 +1 @@" >expect &&
test_cmp expect err
'
test_expect_success 'applying a patch with a missing filename reports the input' '
cat >missing.patch <<-\EOF &&
diff --git a/f b/f
index 7898192..6178079 100644
--- a/f
@@ -1 +1 @@
-a
+b
EOF
test_must_fail git apply missing.patch 2>err &&
echo "error: git diff header lacks filename information at missing.patch:4" >expect &&
test_cmp expect err
'
test_expect_success 'applying a patch with an invalid mode reports the input' '
cat >mode.patch <<-\EOF &&
diff --git a/f b/f
old mode 10x644
EOF
test_must_fail git apply mode.patch 2>err &&
cat >expect <<-\EOF &&
error: invalid mode at mode.patch:2: 10x644
EOF
test_cmp expect err
'
test_expect_success 'applying a patch with only garbage reports the input' '
cat >garbage.patch <<-\EOF &&
diff --git a/f b/f
--- a/f
+++ b/f
this is garbage
EOF
test_must_fail git apply garbage.patch 2>err &&
echo "error: patch with only garbage at garbage.patch:4" >expect &&
test_cmp expect err
'
test_done

20
t/t4103-apply-binary.sh
View File

@@ -179,6 +179,24 @@ test_expect_success PERL_TEST_HELPERS 'reject truncated binary diff' '
" <patch >patch.trunc &&
do_reset &&
test_must_fail git apply patch.trunc
test_must_fail git apply patch.trunc 2>err &&
line=$(awk "END { print NR + 1 }" patch.trunc) &&
grep "error: corrupt binary patch at patch.trunc:$line: " err
'
test_expect_success 'reject unrecognized binary diff' '
cat >patch.bad <<-\EOF &&
diff --git a/f b/f
new file mode 100644
index 0000000..7898192
GIT binary patch
bogus
EOF
test_must_fail git apply patch.bad 2>err &&
cat >expect <<-\EOF &&
error: unrecognized binary patch at patch.bad:4
error: No valid patches in input (allow with "--allow-empty")
EOF
test_cmp expect err
'
test_done

3
t/t4254-am-corrupt.sh
View File

@@ -65,9 +65,8 @@ test_expect_success setup '
test_expect_success 'try to apply corrupted patch' '
test_when_finished "git am --abort" &&
test_must_fail git -c advice.amWorkDir=false -c advice.mergeConflict=false am bad-patch.diff 2>actual &&
echo "error: git diff header lacks filename information (line 4)" >expected &&
test_path_is_file f &&
test_cmp expected actual
test_grep "error: git diff header lacks filename information at .*rebase-apply/patch:4" actual
'
test_expect_success "NUL in commit message's body" '