[dovecot-cvs] dovecot/src/lib-storage/index/dbox dbox-storage.c, 1.35, 1.36

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/dbox
In directory talvi:/tmp/cvs-serv12074/dbox

Modified Files:
	dbox-storage.c 
Log Message:
If KEEP_LOCK is set and we timeout, don't crash.



Index: dbox-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-storage.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- dbox-storage.c	22 Feb 2007 12:50:14 -0000	1.35
+++ dbox-storage.c	22 Feb 2007 13:08:31 -0000	1.36
@@ -545,10 +545,10 @@
 {
 	struct dbox_mailbox *mbox = (struct dbox_mailbox *)box;
 
-	if (mbox->ibox.keep_locked)
+	if (mbox->keep_lock_to != NULL) {
 		dbox_uidlist_unlock(mbox->uidlist);
-	if (mbox->keep_lock_to != NULL)
 		timeout_remove(&mbox->keep_lock_to);
+	}
 
 	dbox_uidlist_deinit(mbox->uidlist);
 	if (mbox->file != NULL)