thodg/libgit2/tests/patch/parse.c

• Show log

  Commit

• Hash : de7659cc
  Author :
  Date : 2019-11-10T18:44:56
  

  patch_parse: use paths from "---"/"+++" lines for binary patches For some patches, it is not possible to derive the old and new file paths from the patch header's first line, most importantly when they contain spaces. In such a case, we derive both paths from the "---" and "+++" lines, which allow for non-ambiguous parsing. We fail to use these paths when parsing binary patches without data, though, as we always expect the header paths to be filled in. Fix this by using the "---"/"+++" paths by default and only fall back to header paths if they aren't set. If neither of those paths are set, we just return an error. Add two tests to verify this behaviour, one of which would have previously caused a segfault.

Download

• tests/patch/parse.c

• #include "clar_libgit2.h"
  #include "patch.h"
  #include "patch_parse.h"
  
  #include "patch_common.h"
  
  static void ensure_patch_validity(git_patch *patch)
  {
  	const git_diff_delta *delta;
  	char idstr[GIT_OID_HEXSZ+1] = {0};
  
  	cl_assert((delta = git_patch_get_delta(patch)) != NULL);
  	cl_assert_equal_i(2, delta->nfiles);
  
  	cl_assert_equal_s(delta->old_file.path, "file.txt");
  	cl_assert(delta->old_file.mode == GIT_FILEMODE_BLOB);
  	cl_assert_equal_i(7, delta->old_file.id_abbrev);
  	git_oid_nfmt(idstr, delta->old_file.id_abbrev, &delta->old_file.id);
  	cl_assert_equal_s(idstr, "9432026");
  	cl_assert_equal_i(0, delta->old_file.size);
  
  	cl_assert_equal_s(delta->new_file.path, "file.txt");
  	cl_assert(delta->new_file.mode == GIT_FILEMODE_BLOB);
  	cl_assert_equal_i(7, delta->new_file.id_abbrev);
  	git_oid_nfmt(idstr, delta->new_file.id_abbrev, &delta->new_file.id);
  	cl_assert_equal_s(idstr, "cd8fd12");
  	cl_assert_equal_i(0, delta->new_file.size);
  }
  
  static void ensure_identical_patch_inout(const char *content) {
  	git_buf buf = GIT_BUF_INIT;
  	git_patch *patch;
  
  	cl_git_pass(git_patch_from_buffer(&patch, content, strlen(content), NULL));
  	cl_git_pass(git_patch_to_buf(&buf, patch));
  	cl_assert_equal_strn(git_buf_cstr(&buf), content, strlen(content));
  
  	git_patch_free(patch);
  	git_buf_dispose(&buf);
  }
  
  void test_patch_parse__original_to_change_middle(void)
  {
  	git_patch *patch;
  
  	cl_git_pass(git_patch_from_buffer(
  		&patch, PATCH_ORIGINAL_TO_CHANGE_MIDDLE,
  		strlen(PATCH_ORIGINAL_TO_CHANGE_MIDDLE), NULL));
  	ensure_patch_validity(patch);
  	git_patch_free(patch);
  }
  
  void test_patch_parse__leading_and_trailing_garbage(void)
  {
  	git_patch *patch;
  	const char *leading = "This is some leading garbage.\n"
  		"Maybe it's email headers?\n"
  		"\n"
  		PATCH_ORIGINAL_TO_CHANGE_MIDDLE;
  	const char *trailing = PATCH_ORIGINAL_TO_CHANGE_MIDDLE
  		"\n"
  		"This is some trailing garbage.\n"
  		"Maybe it's an email signature?\n";
  	const char *both = "Here's some leading garbage\n"
  		PATCH_ORIGINAL_TO_CHANGE_MIDDLE
  		"And here's some trailing.\n";
  
  	cl_git_pass(git_patch_from_buffer(&patch, leading, strlen(leading),
  		NULL));
  	ensure_patch_validity(patch);
  	git_patch_free(patch);
  
  	cl_git_pass(git_patch_from_buffer(&patch, trailing, strlen(trailing),
  		NULL));
  	ensure_patch_validity(patch);
  	git_patch_free(patch);
  
  	cl_git_pass(git_patch_from_buffer(&patch, both, strlen(both),
  		NULL));
  	ensure_patch_validity(patch);
  	git_patch_free(patch);
  }
  
  void test_patch_parse__nonpatches_fail_with_notfound(void)
  {
  	git_patch *patch;
  
  	cl_git_fail_with(GIT_ENOTFOUND,
  		git_patch_from_buffer(&patch, PATCH_NOT_A_PATCH,
  		strlen(PATCH_NOT_A_PATCH), NULL));
  }
  
  void test_patch_parse__invalid_patches_fails(void)
  {
  	git_patch *patch;
  
  	cl_git_fail_with(GIT_ERROR,
  		git_patch_from_buffer(&patch, PATCH_CORRUPT_GIT_HEADER,
  		strlen(PATCH_CORRUPT_GIT_HEADER), NULL));
  	cl_git_fail_with(GIT_ERROR,
  		git_patch_from_buffer(&patch,
  		PATCH_CORRUPT_MISSING_NEW_FILE,
  		strlen(PATCH_CORRUPT_MISSING_NEW_FILE), NULL));
  	cl_git_fail_with(GIT_ERROR,
  		git_patch_from_buffer(&patch,
  		PATCH_CORRUPT_MISSING_OLD_FILE,
  		strlen(PATCH_CORRUPT_MISSING_OLD_FILE), NULL));
  	cl_git_fail_with(GIT_ERROR,
  		git_patch_from_buffer(&patch, PATCH_CORRUPT_NO_CHANGES,
  		strlen(PATCH_CORRUPT_NO_CHANGES), NULL));
  	cl_git_fail_with(GIT_ERROR,
  		git_patch_from_buffer(&patch,
  		PATCH_CORRUPT_MISSING_HUNK_HEADER,
  		strlen(PATCH_CORRUPT_MISSING_HUNK_HEADER), NULL));
  }
  
  void test_patch_parse__no_newline_at_end_of_new_file(void)
  {
  	ensure_identical_patch_inout(PATCH_APPEND_NO_NL);
  }
  
  void test_patch_parse__no_newline_at_end_of_old_file(void)
  {
  	ensure_identical_patch_inout(PATCH_APPEND_NO_NL_IN_OLD_FILE);
  }
  
  void test_patch_parse__files_with_whitespaces_succeeds(void)
  {
  	ensure_identical_patch_inout(PATCH_NAME_WHITESPACE);
  }
  
  void test_patch_parse__lifetime_of_patch_does_not_depend_on_buffer(void)
  {
  	git_buf diff = GIT_BUF_INIT, rendered = GIT_BUF_INIT;
  	git_patch *patch;
  
  	cl_git_pass(git_buf_sets(&diff, PATCH_ORIGINAL_TO_CHANGE_MIDDLE));
  	cl_git_pass(git_patch_from_buffer(&patch, diff.ptr, diff.size, NULL));
  	git_buf_dispose(&diff);
  
  	cl_git_pass(git_patch_to_buf(&rendered, patch));
  	cl_assert_equal_s(PATCH_ORIGINAL_TO_CHANGE_MIDDLE, rendered.ptr);
  	git_buf_dispose(&rendered);
  
  	cl_git_pass(git_patch_to_buf(&rendered, patch));
  	cl_assert_equal_s(PATCH_ORIGINAL_TO_CHANGE_MIDDLE, rendered.ptr);
  	git_buf_dispose(&rendered);
  
  	git_patch_free(patch);
  }
  
  void test_patch_parse__binary_file_with_missing_paths(void)
  {
  	git_patch *patch;
  	cl_git_fail(git_patch_from_buffer(&patch, PATCH_BINARY_FILE_WITH_MISSING_PATHS,
  					  strlen(PATCH_BINARY_FILE_WITH_MISSING_PATHS), NULL));
  }
  
  void test_patch_parse__binary_file_with_whitespace_paths(void)
  {
  	git_patch *patch;
  	cl_git_fail(git_patch_from_buffer(&patch, PATCH_BINARY_FILE_WITH_WHITESPACE_PATHS,
  					  strlen(PATCH_BINARY_FILE_WITH_WHITESPACE_PATHS), NULL));
  }
  
  void test_patch_parse__binary_file_with_empty_quoted_paths(void)
  {
  	git_patch *patch;
  	cl_git_fail(git_patch_from_buffer(&patch, PATCH_BINARY_FILE_WITH_QUOTED_EMPTY_PATHS,
  					  strlen(PATCH_BINARY_FILE_WITH_QUOTED_EMPTY_PATHS), NULL));
  }
  
  void test_patch_parse__binary_file_path_with_spaces(void)
  {
  	git_patch *patch;
  	cl_git_fail(git_patch_from_buffer(&patch, PATCH_BINARY_FILE_PATH_WITH_SPACES,
  					  strlen(PATCH_BINARY_FILE_PATH_WITH_SPACES), NULL));
  }
  
  void test_patch_parse__binary_file_path_without_body_paths(void)
  {
  	git_patch *patch;
  	cl_git_fail(git_patch_from_buffer(&patch, PATCH_BINARY_FILE_PATH_WITHOUT_BODY_PATHS,
  					  strlen(PATCH_BINARY_FILE_PATH_WITHOUT_BODY_PATHS), NULL));
  }
  
  void test_patch_parse__memory_leak_on_multiple_paths(void)
  {
  	git_patch *patch;
  	cl_git_fail(git_patch_from_buffer(&patch, PATCH_MULTIPLE_OLD_PATHS, strlen(PATCH_MULTIPLE_OLD_PATHS), NULL));
  }
  
  void test_patch_parse__truncated_no_newline_at_end_of_file(void)
  {
  	size_t len = strlen(PATCH_APPEND_NO_NL) - strlen("at end of file\n");
  	const git_diff_line *line;
  	git_patch *patch;
  
  	cl_git_pass(git_patch_from_buffer(&patch, PATCH_APPEND_NO_NL, len, NULL));
  	cl_git_pass(git_patch_get_line_in_hunk(&line, patch, 0, 4));
  	cl_assert_equal_s(line->content, "\\ No newline ");
  
  	git_patch_free(patch);
  }
  
  void test_patch_parse__line_number_overflow(void)
  {
  	git_patch *patch;
  	cl_git_fail(git_patch_from_buffer(&patch, PATCH_INTMAX_NEW_LINES, strlen(PATCH_INTMAX_NEW_LINES), NULL));
  	git_patch_free(patch);
  }
  

Download