@matheusbsbs / matheus-bagliano / commits / b1c2f57db3

diff_grep: use textconv buffers for add/deleted files

If you use "-G" to grep a diff, we will apply a configured textconv filter to the data before generating the diff. However, if the diff is an addition or deletion, we do not bother running the diff at all, and just look for the token in the added (or removed) content. This works because we know that the diff must contain every line of content. However, while we used the textconv-derived buffers in the regular diff, we accidentally passed the original unmodified buffers to regexec when checking the added or removed content. This could lead to an incorrect answer. Worse, in some cases we might have a textconv buffer but no original buffer (e.g., if we pulled the textconv data from cache, or if we reused a working tree file when generating it). In that case, we could actually feed NULL to regexec and segfault. Reported-by: Peter Oberndorfer <kumbayo84@arcor.de> Signed-off-by: Jeff King <peff@peff.net>

Jeff King committed Oct 28, 2012 at 07:40 UTC b1c2f57db326c43ec286855b396fb16b4890cf2d

2 files changed +14 -2

diffcore-pickaxe.c

+2 -2

@@ -104,10 +104,10 @@ static int diff_grep(struct diff_filepair *p, struct diff_options *o,

104 if (!mf2.ptr)

105 return 0; /* ignore unmerged */

106 /* created "two" -- does it have what we are looking for? */

107 - hit = !regexec(regexp, p->two->data, 1, &regmatch, 0);

107 + hit = !regexec(regexp, mf2.ptr, 1, &regmatch, 0);

108 } else if (!mf2.ptr) {

109 /* removed "one" -- did it have what we are looking for? */

110 - hit = !regexec(regexp, p->one->data, 1, &regmatch, 0);

110 + hit = !regexec(regexp, mf1.ptr, 1, &regmatch, 0);

111 } else {

112 /*

113 * We have both sides; need to run textual diff and see if

t/t4030-diff-textconv.sh

+12

@@ -84,6 +84,18 @@ test_expect_success 'status -v produces text' '

84 git reset --soft HEAD@{1}

85 '

87 +test_expect_success 'grep-diff (-G) operates on textconv data (add)' '

88 + echo one >expect &&

89 + git log --root --format=%s -G0 >actual &&

90 + test_cmp expect actual

91 +'

92 +

93 +test_expect_success 'grep-diff (-G) operates on textconv data (modification)' '

94 + echo two >expect &&

95 + git log --root --format=%s -G1 >actual &&

96 + test_cmp expect actual

97 +'

98 +

99 cat >expect.stat <<'EOF'

100 file | Bin 2 -> 4 bytes

101 1 file changed, 0 insertions(+), 0 deletions(-)