summaryrefslogtreecommitdiff
path: root/diff-no-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-25 18:25:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-25 18:25:36 (GMT)
commit98eb3fc6cbdede41809e29166ddad4edf6acd1f4 (patch)
treea42606abde38efc736e8010ac857e4853aa967c0 /diff-no-index.c
parenta3347b988a338e95b7f3b11eda776ac0d7b84dd0 (diff)
parent176a33542eddc6e319bfef4ca726813ce0b9af55 (diff)
downloadgit-98eb3fc6cbdede41809e29166ddad4edf6acd1f4.zip
git-98eb3fc6cbdede41809e29166ddad4edf6acd1f4.tar.gz
git-98eb3fc6cbdede41809e29166ddad4edf6acd1f4.tar.bz2
Merge branch 'bp/diff-no-index-strbuf-fix' into maint
The directory path used in "git diff --no-index", when it recurses down, was broken with a recent update after v1.7.10.1 release. By Bobby Powers * bp/diff-no-index-strbuf-fix: diff --no-index: don't leak buffers in queue_diff diff --no-index: reset temporary buffer lengths on directory iteration
Diffstat (limited to 'diff-no-index.c')
-rw-r--r--diff-no-index.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/diff-no-index.c b/diff-no-index.c
index b44473e..f0b0010 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -68,6 +68,7 @@ static int queue_diff(struct diff_options *o,
struct string_list p1 = STRING_LIST_INIT_DUP;
struct string_list p2 = STRING_LIST_INIT_DUP;
int i1, i2, ret = 0;
+ size_t len1 = 0, len2 = 0;
if (name1 && read_directory(name1, &p1))
return -1;
@@ -80,18 +81,23 @@ static int queue_diff(struct diff_options *o,
strbuf_addstr(&buffer1, name1);
if (buffer1.len && buffer1.buf[buffer1.len - 1] != '/')
strbuf_addch(&buffer1, '/');
+ len1 = buffer1.len;
}
if (name2) {
strbuf_addstr(&buffer2, name2);
if (buffer2.len && buffer2.buf[buffer2.len - 1] != '/')
strbuf_addch(&buffer2, '/');
+ len2 = buffer2.len;
}
for (i1 = i2 = 0; !ret && (i1 < p1.nr || i2 < p2.nr); ) {
const char *n1, *n2;
int comp;
+ strbuf_setlen(&buffer1, len1);
+ strbuf_setlen(&buffer2, len2);
+
if (i1 == p1.nr)
comp = 1;
else if (i2 == p2.nr)
@@ -117,8 +123,8 @@ static int queue_diff(struct diff_options *o,
}
string_list_clear(&p1, 0);
string_list_clear(&p2, 0);
- strbuf_reset(&buffer1);
- strbuf_reset(&buffer2);
+ strbuf_release(&buffer1);
+ strbuf_release(&buffer2);
return ret;
} else {