fixes applied

6 files changed, 54 insertions, 4 deletions

diff --git a/libetpan/src/data-types/mailstream_helper.c b/libetpan/src/data-types/mailstream_helper.c
index 2f0b9ae..f0ddf51 100644
--- a/libetpan/src/data-types/mailstream_helper.c
+++ b/libetpan/src/data-types/mailstream_helper.c
@@ -99,8 +99,15 @@ char * mailstream_read_line_append(mailstream * stream, MMAPString * line)
         return NULL;
 
-      if (r == 0)
+      if (r == 0) { 
+          // LR
+          // this avoids a memory access violation later when trying
+          // to remove_trailing_eol from a null string
+          if ( line->len == 0 )
+              return NULL;
+          else
         break;
     }
   }
+  }
   while (1);
 
diff --git a/libetpan/src/driver/implementation/pop3/pop3driver.c b/libetpan/src/driver/implementation/pop3/pop3driver.c
index ea69923..6cc6a9a 100644
--- a/libetpan/src/driver/implementation/pop3/pop3driver.c
+++ b/libetpan/src/driver/implementation/pop3/pop3driver.c
@@ -250,4 +250,6 @@ static int pop3driver_login(mailsession * session,
 {
   int r;
+  //LR
+  int ret;
   carray * msg_tab;
   struct pop3_session_state_data * data;
@@ -272,5 +274,9 @@ static int pop3driver_login(mailsession * session,
   }
 
+  // LR 2 lines
+  ret = pop3driver_pop3_error_to_mail_error(r);
+  if ( ret ==  MAIL_NO_ERROR  )
   mailpop3_list(get_pop3_session(session), &msg_tab);
+  // LR
 
   return pop3driver_pop3_error_to_mail_error(r);
diff --git a/libetpan/src/low-level/imap/mailimap_parser.c b/libetpan/src/low-level/imap/mailimap_parser.c
index ab4db67..071891c 100644
--- a/libetpan/src/low-level/imap/mailimap_parser.c
+++ b/libetpan/src/low-level/imap/mailimap_parser.c
@@ -2400,7 +2400,25 @@ mailimap_body_fld_enc_parse(mailstream * fd, MMAPString * buffer,
                               progr_rate, progr_fun);
     if (r != MAILIMAP_NO_ERROR) {
-      res = r;
+        // LR start
+        // accept NIL and set type to utf8
+        int ret = r;
+        r = mailimap_char_parse(fd, buffer, &cur_token, 'N');
+        if (r == MAILIMAP_NO_ERROR) {
+            r = mailimap_char_parse(fd, buffer, &cur_token, 'I');
+            if (r == MAILIMAP_NO_ERROR) {
+                r = mailimap_char_parse(fd, buffer, &cur_token, 'L');
+                if (r == MAILIMAP_NO_ERROR) {
+                    type = 4;
+                    ret = MAILIMAP_NO_ERROR;
+                    value = NULL;
+                }
+            }
+        }
+        if ( ret != MAILIMAP_NO_ERROR ) {
+            res = ret;
       goto err;
     }
+        // LR end
+    }
   }
   else {
diff --git a/libetpan/src/low-level/maildir/maildir.c b/libetpan/src/low-level/maildir/maildir.c
index 98b9f87..e81625d 100644
--- a/libetpan/src/low-level/maildir/maildir.c
+++ b/libetpan/src/low-level/maildir/maildir.c
@@ -111,4 +111,6 @@ static char * maildir_get_new_message_filename(struct maildir * md,
   int k;
   time_t now;
+  //LR
+  struct stat f_stat;
   int got_file;
   int r;
@@ -123,4 +125,15 @@ static char * maildir_get_new_message_filename(struct maildir * md,
         md->mdir_path, basename);
     
+    // LR changed following lines
+    if ( stat( filename,  &f_stat   ) == -1 ) {
+        char * dup_filename;
+        
+        dup_filename = strdup(filename);
+        if (dup_filename == NULL) {
+            //unlink(filename);
+            return NULL;
+        }
+        rename (tmpfile,dup_filename );
+#if 0    
     if (link(tmpfile, filename) == 0) {
       got_file = 1;
@@ -148,5 +161,5 @@ static char * maildir_get_new_message_filename(struct maildir * md,
         return NULL;
       }
-      
+#endif      
       md->mdir_counter ++;
       
diff --git a/libetpan/src/low-level/mh/mailmh.c b/libetpan/src/low-level/mh/mailmh.c
index 42cab9d..f8c694d 100644
--- a/libetpan/src/low-level/mh/mailmh.c
+++ b/libetpan/src/low-level/mh/mailmh.c
@@ -921,4 +921,7 @@ int mailmh_folder_remove_message(struct mailmh_folder * folder,
     chash_delete(folder->fl_msgs_hash, &key, NULL);
   }
+  // LR memory leak fixed
+  mailmh_msg_info_free( msg_info );
+  free(filename);
 
   return MAILMH_NO_ERROR;
diff --git a/libetpan/src/low-level/pop3/mailpop3.c b/libetpan/src/low-level/pop3/mailpop3.c
index 6f77a3a..bca62d5 100644
--- a/libetpan/src/low-level/pop3/mailpop3.c
+++ b/libetpan/src/low-level/pop3/mailpop3.c
@@ -509,6 +509,9 @@ int mailpop3_pass(mailpop3 * f, const char * password)
   r = parse_response(f, response);
 
-  if (r != RESPONSE_OK)
+  if (r != RESPONSE_OK) {  
+      // LR
+      fprintf(stderr,"POP3 login error. Response from server:\n%s\n",response );
     return MAILPOP3_ERROR_BAD_PASSWORD;
+  }
 
   f->pop3_state = POP3_STATE_TRANSACTION;