[dovecot-cvs] dovecot/src/lib-index/mbox mbox-index.c,1.61,1.62

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-index/mbox
In directory danu:/tmp/cvs-serv23941/src/lib-index/mbox

Modified Files:
	mbox-index.c 
Log Message:
Valid From-line parsing could have crashed too.



Index: mbox-index.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-index/mbox/mbox-index.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- mbox-index.c	4 Feb 2003 02:42:32 -0000	1.61
+++ mbox-index.c	4 Feb 2003 03:37:51 -0000	1.62
@@ -551,7 +551,15 @@
 				break;
 			case 'm':
 				if (msg[i] == ' ') {
-					if (mbox_is_valid_from(input, i+1)) {
+					int valid;
+
+					valid = mbox_is_valid_from(input, i+1);
+
+					/* we may have trashed msg above,
+					   get it again */
+					msg = i_stream_get_data(input, &size);
+
+					if (valid) {
 						/* Go back "From" */
 						i -= 4;
 
@@ -567,10 +575,6 @@
 						i_stream_skip(input, i);
 						return;
 					}
-
-					/* we may have trashed msg on the way,
-					   get it again */
-					msg = i_stream_get_data(input, &size);
 				}
 				break;
 			}