dovecot-2.2: maildir: Make sure we don't replace correct mail si...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/021f78ba15c1
changeset: 17294:021f78ba15c1
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Apr 29 16:44:58 2014 +0300
description:
maildir: Make sure we don't replace correct mail sizes with broken ones when preserving GUID.

diffstat:

 src/lib-storage/index/maildir/maildir-save.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r dc4fd0ab5c14 -r 021f78ba15c1 src/lib-storage/index/maildir/maildir-save.c
--- a/src/lib-storage/index/maildir/maildir-save.c	Tue Apr 29 16:14:14 2014 +0300
+++ b/src/lib-storage/index/maildir/maildir-save.c	Tue Apr 29 16:44:58 2014 +0300
@@ -851,10 +851,12 @@
 					      mf->dest_basename) != NULL) {
 		/* file already exists. give it another name.
 		   but preserve the size/vsize in the filename if possible */
-		if (maildir_filename_get_size(mf->dest_basename,
+		if (mf->size == (uoff_t)-1 &&
+		    maildir_filename_get_size(mf->dest_basename,
 					      MAILDIR_EXTRA_FILE_SIZE, &size))
 			mf->size = size;
-		if (maildir_filename_get_size(mf->dest_basename,
+		if (mf->vsize == (uoff_t)-1 &&
+		    maildir_filename_get_size(mf->dest_basename,
 					      MAILDIR_EXTRA_VIRTUAL_SIZE,
 					      &size))
 			mf->vsize = size;