dovecot-2.2: lib-index: Removed duplicate ext-intro checking code.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/222c7d752519
changeset: 14883:222c7d752519
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Aug 13 00:31:40 2012 +0300
description:
lib-index: Removed duplicate ext-intro checking code.

diffstat:

 src/lib-index/mail-index-sync-update.c |  15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)

diffs (32 lines):

diff -r ba6b92cf7d49 -r 222c7d752519 src/lib-index/mail-index-sync-update.c
--- a/src/lib-index/mail-index-sync-update.c	Mon Aug 13 00:29:38 2012 +0300
+++ b/src/lib-index/mail-index-sync-update.c	Mon Aug 13 00:31:40 2012 +0300
@@ -539,12 +539,7 @@
 		t_array_init(&uids, 64);
 		end = CONST_PTR_OFFSET(data, hdr->size);
 		for (; rec != end; rec++) {
-			if (rec->uid == 0) {
-				mail_index_sync_set_corrupted(ctx,
-					"Expunge-guid for invalid uid=%u",
-					rec->uid);
-				break;
-			}
+			i_assert(rec->uid != 0);
 			seq_range_array_add(&uids, rec->uid);
 		}
 
@@ -601,12 +596,8 @@
 			}
 
 			rec = CONST_PTR_OFFSET(data, i);
-			if (i + sizeof(*rec) + rec->name_size > hdr->size) {
-				mail_index_sync_set_corrupted(ctx,
-					"ext intro: name_size too large");
-				ret = -1;
-				break;
-			}
+			/* name_size checked by _log_view_next() */
+			i_assert(i + sizeof(*rec) + rec->name_size <= hdr->size);
 
 			ret = mail_index_sync_ext_intro(ctx, rec);
 			if (ret <= 0)