mailinfo.c: move side-effects outside of assert

mackyle · gitster · commit 08414938a26f · 2016-12-20T09:30:01.000-08:00
Since 6b4b013 (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>
diff --git 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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -628,7 +628,8 @@ static void flush_inbody_header_accum(struct mailinfo *mi)`
`628`	`628`	`{`
`629`	`629`	`if (!mi->inbody_header_accum.len)`
`630`	`630`	`return;`
`631`		`- assert(check_header(mi, &mi->inbody_header_accum, mi->s_hdr_data, 0));`
	`631`	`+ if (!check_header(mi, &mi->inbody_header_accum, mi->s_hdr_data, 0))`
	`632`	`+ die("BUG: inbody_header_accum, if not empty, must always contain a valid in-body header");`
`632`	`633`	`strbuf_reset(&mi->inbody_header_accum);`
`633`	`634`	`}`
`634`	`635`