dovecot-2.2: lib-index: Fixed assert-crash on some error conditi...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/e33fe1a7bb89
changeset: 15951:e33fe1a7bb89
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Feb 22 15:49:35 2013 +0200
description:
lib-index: Fixed assert-crash on some error conditions.

diffstat:

 src/lib-index/mail-transaction-log-file.c |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 0a932ba1f01f -r e33fe1a7bb89 src/lib-index/mail-transaction-log-file.c
--- a/src/lib-index/mail-transaction-log-file.c	Fri Feb 22 14:49:27 2013 +0200
+++ b/src/lib-index/mail-transaction-log-file.c	Fri Feb 22 15:49:35 2013 +0200
@@ -1683,7 +1683,7 @@
 	}
 
 	if (MAIL_TRANSACTION_LOG_FILE_IN_MEMORY(file)) {
-		if (start_offset < file->buffer_offset) {
+		if (start_offset < file->buffer_offset || file->buffer == NULL) {
 			/* we had moved the log to memory but failed to read
 			   the beginning of the log file */
 			mail_index_set_error(index,
@@ -1691,7 +1691,6 @@
 				file->filepath);
 			return 0;
 		}
-		i_assert(file->buffer != NULL);
 		return log_file_map_check_offsets(file, start_offset,
 						  end_offset);
 	}