From 60d1574cc5588f84a8592ca8a76461bf263045e6 Mon Sep 17 00:00:00 2001
From: "C. McEnroe" <june@causal.agency>
Date: Wed, 15 Apr 2020 11:35:51 -0400
Subject: Verify that bodyParts is parallel to structure

---
 export.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/export.c b/export.c
index 3e1b2dc..3786220 100644
--- a/export.c
+++ b/export.c
@@ -138,6 +138,25 @@ static void exportFetchParts(
 	}
 }
 
+static void checkBodyParts(const struct BodyPart *structure, struct Data body) {
+	if (structure->multipart) {
+		struct List list = dataCheck(body, List).list;
+		if (list.len < structure->parts.len) {
+			errx(EX_PROTOCOL, "missing body parts");
+		}
+		for (size_t i = 0; i < structure->parts.len; ++i) {
+			checkBodyParts(&structure->parts.ptr[i], list.ptr[i]);
+		}
+	} else if (
+		structure->message.structure &&
+		structure->message.structure->multipart
+	) {
+		checkBodyParts(structure->message.structure, body);
+	} else if (body.type != String) {
+		errx(EX_PROTOCOL, "missing body part");
+	}
+}
+
 bool exportData(FILE *imap, enum Atom tag, struct List items) {
 	uint32_t uid = 0;
 	struct Envelope envelope = {0};
@@ -202,6 +221,9 @@ bool exportData(FILE *imap, enum Atom tag, struct List items) {
 	if (!structure.subtype) {
 		errx(EX_PROTOCOL, "missing BODYSTRUCTURE data item");
 	}
+	if (bodyParts.type == List) {
+		checkBodyParts(&structure, bodyParts);
+	}
 
 	if (bodyHeader.type == String && bodyText.type == String) {
 		exportMbox(uid, &envelope, bodyHeader.string, bodyText.string);
@@ -211,7 +233,6 @@ bool exportData(FILE *imap, enum Atom tag, struct List items) {
 	if (!structure.multipart) {
 		exportAtom(uid, &envelope, &structure, bodyText);
 	} else if (bodyParts.type == List) {
-		// TODO: Validate that bodyParts is parallel to structure.
 		exportAtom(uid, &envelope, &structure, bodyParts);
 	} else {
 		fetch = true;
-- 
cgit 1.4.1

ref='/src/log/?id=ec966f4bd932379e714aafc78c6fc70117c9a704&amp;follow=1'>root</a>/<a href='/src/log/pdf?id=ec966f4bd932379e714aafc78c6fc70117c9a704&amp;follow=1'>pdf</a>/<a href='/src/log/pdf/Makefile?id=ec966f4bd932379e714aafc78c6fc70117c9a704&amp;follow=1'>Makefile</a> (<a href='/src/log/pdf/Makefile?id=ec966f4bd932379e714aafc78c6fc70117c9a704'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/pdf/Makefile?id=ec966f4bd932379e714aafc78c6fc70117c9a704&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-08-23 18:49:55 -0400'>2020-08-23</span></td><td><a href='/src/commit/www/causal.agency/scheme.sed?id=54c6e6b655ccb638cdb64fa059aaf4d6e25cadc3&amp;follow=1'>Use scheme CSS variables for causal.agency</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-08-23 18:35:34 -0400'>2020-08-23</span></td><td><a href='/src/commit/bin/scheme.c?id=4b891922e10ce3de0e562a21c1aeeb9341a17c8c&amp;follow=1'>Use CSS variables in scheme output</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-08-23 18:28:59 -0400'>2020-08-23</span></td><td><a href='/src/commit/www/causal.agency/index.html.in?id=6669a296a686f60a93f40b1270c311cfe4db4c8d&amp;follow=1'>Add catsit to causal.agency</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2020-08-23 18:27:37 -0400'>2020-08-23</span></td><td><a href='/src/commit/www/causal.agency/index.html.in?id=7ad29e68e71752a7658f85e7e7ff75ff1f13077d&amp;follow=1'>Add some actual info to top of causal.agency</a></td><td>June McEnroe