[dovecot-cvs] dovecot/src/lib-storage/index/dbox dbox-storage.c, 1.15.2.11, 1.15.2.12

[tss at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	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.15.2.11
retrieving revision 1.15.2.12
diff -u -d -r1.15.2.11 -r1.15.2.12
--- dbox-storage.c	22 Feb 2007 12:50:08 -0000	1.15.2.11
+++ dbox-storage.c	22 Feb 2007 13:08:29 -0000	1.15.2.12
@@ -726,10 +726,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)