[dovecot-cvs] dovecot/src/lib-mail message-part-serialize.c, 1.21, 1.22

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-mail
In directory talvi:/tmp/cvs-serv26551

Modified Files:
	message-part-serialize.c 
Log Message:
Validate deserialization better.



Index: message-part-serialize.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-mail/message-part-serialize.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- message-part-serialize.c	10 Sep 2004 11:45:21 -0000	1.21
+++ message-part-serialize.c	28 Oct 2005 13:38:22 -0000	1.22
@@ -209,12 +209,11 @@
 		}
 
 		if (children_count > 0) {
-			/* our children must be after our physical_pos and
-			   the last child must be within our size. */
-			ctx->pos = part->physical_pos;
-			pos = part->physical_pos +
-				part->header_size.physical_size +
-				part->body_size.physical_size;
+			/* our children must be after our physical_pos+header
+			   and the last child must be within our size. */
+			ctx->pos = part->physical_pos +
+				part->header_size.physical_size;
+			pos = ctx->pos + part->body_size.physical_size;
 
 			if (!message_part_deserialize_part(ctx, part,
 							   children_count,