diff options
| author | Kyle J. McKay <mackyle@gmail.com> | 2016-12-19 15:13:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-20 09:30:01 -0800 |
| commit | 08414938a26f66988418dfdac03a62b97450056d (patch) | |
| tree | 651d4edf07f9f75619708547bbbeb8be4d398392 | |
| parent | 6b4b013f1884a3b5e67877d65a9f1da598ab4a6f (diff) | |
| download | git-jt/mailinfo-fold-in-body-headers.tar.gz | |
mailinfo.c: move side-effects outside of assertjt/mailinfo-fold-in-body-headers
Since 6b4b013f18 (mailinfo: handle in-body header continuations,
2016-09-20, v2.11.0) mailinfo.c has contained new code with an
assert of the form:
assert(call_a_function(...))
The function in question, check_header, has side effects. This
means that when NDEBUG is defined during a release build the
function call is omitted entirely, the side effects do not
take place and tests (fortunately) start failing.
Since the only time that mi->inbody_header_accum is appended to is
in check_inbody_header, and appending onto a blank
mi->inbody_header_accum always happens when is_inbody_header is
true, this guarantees a prefix that causes check_header to always
return true.
Therefore replace the assert with an if !check_header + DIE
combination to reflect this.
Helped-by: Jonathan Tan <jonathantanmy@google.com>
Helped-by: Jeff King <peff@peff.net>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | mailinfo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mailinfo.c b/mailinfo.c index 2275b285f0..e92aff9ded 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -628,7 +628,8 @@ static void flush_inbody_header_accum(struct mailinfo *mi) { if (!mi->inbody_header_accum.len) return; - assert(check_header(mi, &mi->inbody_header_accum, mi->s_hdr_data, 0)); + if (!check_header(mi, &mi->inbody_header_accum, mi->s_hdr_data, 0)) + die("BUG: inbody_header_accum, if not empty, must always contain a valid in-body header"); strbuf_reset(&mi->inbody_header_accum); } |