| Message ID | Y0363eQnvcNkCG/O@coredump.intra.peff.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0e5a87e0422ff308641199d1afe94b58e1249bc0 |
| Headers | show |
| Series | more unused-parameter fixes / annotations | expand |
diff --git a/diff.c b/diff.c index 648f6717a5..bba888a34a 100644 --- a/diff.c +++ b/diff.c @@ -2488,6 +2488,9 @@ static int diffstat_consume(void *priv, char *line, unsigned long len) struct diffstat_t *diffstat = priv; struct diffstat_file *x = diffstat->files[diffstat->nr - 1]; + if (!len) + BUG("xdiff fed us an empty line"); + if (line[0] == '+') x->added++; else if (line[0] == '-')
The callback interface for xdiff_emit_line_fn gives us a line/len pair, but diffstat_consume() never looks at "len". At first glance this seems like a bug that could cause us to read further than xdiff intends. But in practice, we read only the first character, and xdiff would never pass us an empty line. Let's add a run-time assertion that this is true, which clarifies our assumption and silences -Wunused-parameter. Signed-off-by: Jeff King <peff@peff.net> --- diff.c | 3 +++ 1 file changed, 3 insertions(+)