From: fork0@t-online.de (Alex Riesen)
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <junkio@cox.net>
Subject: [PATCH 2/4] make filepairs detachable
Date: Fri, 30 Jun 2006 02:27:36 +0200 [thread overview]
Message-ID: <20060630002736.GB22618@steel.home> (raw)
Actually, just make sure diff_flush does not crash for diff queue
entries which were cleared.
---
diff.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/diff.c b/diff.c
index 5a71489..b3480f6 100644
--- a/diff.c
+++ b/diff.c
@@ -2281,6 +2281,8 @@ void diff_flush(struct diff_options *opt
}
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
+ if (!p)
+ continue;
flush_one_pair(p, diff_output_format, options, diffstat);
}
@@ -2290,6 +2292,8 @@ void diff_flush(struct diff_options *opt
}
for (i = 0; i < q->nr; i++) {
+ if (!q->queue[i])
+ continue;
if (diffstat && options->summary)
diff_summary(q->queue[i]);
diff_free_filepair(q->queue[i]);
--
1.4.1.rc1.g17dc
next reply other threads:[~2006-06-30 0:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-30 0:27 Alex Riesen [this message]
2006-06-30 1:16 ` [PATCH 2/4] make filepairs detachable Junio C Hamano
2006-06-30 7:42 ` Alex Riesen
2006-06-30 7:50 ` Junio C Hamano
2006-06-30 8:21 ` Alex Riesen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060630002736.GB22618@steel.home \
--to=fork0@t-online.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).