Commit ed959ca2f158862a59584cbfa0d39a845419f514
2019-04-16T12:36:24
Merge pull request #5027 from ddevault/master patch_parse.c: Handle CRLF in parse_header_start
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
diff --git a/src/patch_parse.c b/src/patch_parse.c
index 545f1ca..d731115 100644
--- a/src/patch_parse.c
+++ b/src/patch_parse.c
@@ -328,7 +328,8 @@ static int parse_header_start(git_patch_parsed *patch, git_patch_parse_ctx *ctx)
* proceeed here. We then hope for the "---" and "+++" lines to fix that
* for us.
*/
- if (!git_parse_ctx_contains(&ctx->parse_ctx, "\n", 1)) {
+ if (!git_parse_ctx_contains(&ctx->parse_ctx, "\n", 1) &&
+ !git_parse_ctx_contains(&ctx->parse_ctx, "\r\n", 2)) {
git_parse_advance_chars(&ctx->parse_ctx, ctx->parse_ctx.line_len - 1);
git__free(patch->header_old_path);
diff --git a/tests/diff/parse.c b/tests/diff/parse.c
index 7cc4682..a067861 100644
--- a/tests/diff/parse.c
+++ b/tests/diff/parse.c
@@ -360,6 +360,7 @@ void test_diff_parse__lineinfo(void)
git_diff_free(diff);
}
+
void test_diff_parse__new_file_with_space(void)
{
const char *content = PATCH_ORIGINAL_NEW_FILE_WITH_SPACE;
@@ -377,3 +378,21 @@ void test_diff_parse__new_file_with_space(void)
git_patch_free(patch);
git_diff_free(diff);
}
+
+void test_diff_parse__crlf(void)
+{
+ const char *text = PATCH_CRLF;
+ git_diff *diff;
+ git_patch *patch;
+ const git_diff_delta *delta;
+
+ cl_git_pass(git_diff_from_buffer(&diff, text, strlen(text)));
+ cl_git_pass(git_patch_from_diff(&patch, diff, 0));
+ delta = git_patch_get_delta(patch);
+
+ cl_assert_equal_s(delta->old_file.path, "test-file");
+ cl_assert_equal_s(delta->new_file.path, "test-file");
+
+ git_patch_free(patch);
+ git_diff_free(diff);
+}
diff --git a/tests/patch/patch_common.h b/tests/patch/patch_common.h
index 75aab44..291ece9 100644
--- a/tests/patch/patch_common.h
+++ b/tests/patch/patch_common.h
@@ -850,3 +850,12 @@
"+++ b/sp ace.txt\n" \
"@@ -0,0 +1 @@\n" \
"+a\n"
+
+#define PATCH_CRLF \
+ "diff --git a/test-file b/test-file\r\n" \
+ "new file mode 100644\r\n" \
+ "index 0000000..af431f2 100644\r\n" \
+ "--- /dev/null\r\n" \
+ "+++ b/test-file\r\n" \
+ "@@ -0,0 +1 @@\r\n" \
+ "+a contents\r\n"