[evolution-data-server] Fix for bug #578822

[Sergio Villar Senin <svillar src gnome org>]

commit 0d20b56fd9efbd20d993dd062278be61e68ea9dc
Author: Sergio Villar Senín <svillar igalia com>
Date:   Fri Apr 24 11:45:45 2009 +0200

    Fix for bug #578822
---
 camel/ChangeLog           |    7 +++++++
 camel/camel-mime-parser.c |    3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 5c06dde..fac7113 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-24  Sergio Villar Senin  <svillar igalia com>
+
+	** Fix for bug #578822 - fixed potential invalid dereference
+	
+	* camel-mime-parser.c (folder_scan_header): fixed a potential
+	invalid dereference
+
 2009-04-22  Sergio Villar Senin  <svillar igalia com>
 	
 	** Fix for bug #578817 - fixed potential invalid dereference
diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c
index 7896d96..38d8590 100644
--- a/camel/camel-mime-parser.c
+++ b/camel/camel-mime-parser.c
@@ -1197,6 +1197,7 @@ folder_scan_header(struct _header_scan_state *s, int *lastone)
 			inend = s->inend-s->atleast+1;
 			
 			while (inptr<inend) {
+				start = inptr;
 				if (!s->midline) {
 					if (folder_boundary_check(s, inptr, lastone)) {
 						if ((s->outptr>s->outbuf))
@@ -1206,8 +1207,6 @@ folder_scan_header(struct _header_scan_state *s, int *lastone)
 					}
 				}
 				
-				start = inptr;
-
 				/* goto next line/sentinal */
 				while ((*inptr++)!='\n')
 					;