@matheusbsbs / matheus-bagliano / commits / 24305cd700

Fork 0

apply: don't segfault on binary files with missing data

Usually when applying a binary diff generated without --binary, it will be rejected early, as we don't even have the full sha1 of the pre- and post-images. However, if the diff is generated with --full-index (but not --binary), then we will actually try to apply it. If we have the postimage blob, then we can take a shortcut and never even look at the binary diff at all (e.g., this can happen when rebasing changes within a repository). If we don't have the postimage blob, though, we try to look at the actual fragments, of which there are none, and get a segfault. This patch checks explicitly for that case and complains to the user instead of segfaulting. We need to keep the check at a low level so that the "shortcut" case above continues to work. We also add a test that demonstrates the segfault. While we're at it, let's also explicitly test the shortcut case. Reported-by: Rafaël Carré <rafael.carre@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Oct 18, 2010 at 14:39 UTC 24305cd7009d682ba4115103c95844446a2bb305

2 files changed +32 -1

builtin/apply.c

@@ -2645,6 +2645,12 @@ static int apply_binary_fragment(struct image *img, struct patch *patch)

2645 unsigned long len;

2646 void *dst;

2647

2648 + if (!fragment)

2649 + return error("missing binary patch data for '%s'",

2650 + patch->new_name ?

2651 + patch->new_name :

2652 + patch->old_name);

2653 +

2654 /* Binary patch is irreversible without the optional second hunk */

2655 if (apply_in_reverse) {

2656 if (!fragment->next)

t/t4103-apply-binary.sh

+26 -1

@@ -37,7 +37,16 @@ test_expect_success 'setup' "

37 git diff-tree -p -C master binary >C.diff &&

39 git diff-tree -p --binary master binary >BF.diff &&

40 - git diff-tree -p --binary -C master binary >CF.diff

40 + git diff-tree -p --binary -C master binary >CF.diff &&

41 +

42 + git diff-tree -p --full-index master binary >B-index.diff &&

43 + git diff-tree -p -C --full-index master binary >C-index.diff &&

44 +

45 + git init other-repo &&

46 + (cd other-repo &&

47 + git fetch .. master &&

48 + git reset --hard FETCH_HEAD

49 + )

50 "

52 test_expect_success 'stat binary diff -- should not fail.' \

@@ -100,6 +109,22 @@ test_expect_success 'apply binary diff (copy) -- should fail.' \

109 'do_reset &&

110 test_must_fail git apply --index C.diff'

111

112 +test_expect_success 'apply binary diff with full-index' '

113 + do_reset &&

114 + git apply B-index.diff

115 +'

116 +

117 +test_expect_success 'apply binary diff with full-index (copy)' '

118 + do_reset &&

119 + git apply C-index.diff

120 +'

121 +

122 +test_expect_success 'apply full-index binary diff in new repo' '

123 + (cd other-repo &&

124 + do_reset &&

125 + test_must_fail git apply ../B-index.diff)

126 +'

127 +

128 test_expect_success 'apply binary diff without replacement.' \

129 'do_reset &&

130 git apply BF.diff'