Fix for bug #578822

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 5c06dde..fac7113 100644 (file)
--- 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 (file)
--- 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')
                                        ;