3 files changed, 17 insertions, 4 deletions

diff --git a/kmicromail/libetpan/generic/pop3driver.c b/kmicromail/libetpan/generic/pop3driver.c
index 375879e..475dfcc 100644
--- a/kmicromail/libetpan/generic/pop3driver.c
+++ b/kmicromail/libetpan/generic/pop3driver.c
@@ -257,36 +257,39 @@ static int pop3driver_login(mailsession * session,
   switch (data->pop3_auth_type) {
   case POP3DRIVER_AUTH_TYPE_TRY_APOP:
     r = mailpop3_login_apop(get_pop3_session(session), userid, password);
     if (r != MAILPOP3_NO_ERROR)
       r = mailpop3_login(get_pop3_session(session), userid, password);
     break;
 
   case POP3DRIVER_AUTH_TYPE_APOP:
     r = mailpop3_login_apop(get_pop3_session(session), userid, password);
     break;
 
   default:
   case POP3DRIVER_AUTH_TYPE_PLAIN:
     r = mailpop3_login(get_pop3_session(session), userid, password);
     break;
   }
-
+  // LR 2 lines
+  int ret = pop3driver_pop3_error_to_mail_error(r);
+  if ( ret ==  MAIL_NO_ERROR  )
   mailpop3_list(get_pop3_session(session), &msg_tab);
 
-  return pop3driver_pop3_error_to_mail_error(r);
+  // LR
+  return ret;
 }
 
 static int pop3driver_logout(mailsession * session)
 {
   int r;
 
   r = mailpop3_quit(get_pop3_session(session));
 
   return pop3driver_pop3_error_to_mail_error(r);
 }
 
 static int pop3driver_noop(mailsession * session)
 {
   int r;
 
   r = mailpop3_noop(get_pop3_session(session));
diff --git a/kmicromail/libetpan/pop3/mailpop3.c b/kmicromail/libetpan/pop3/mailpop3.c
index 28fafe9..691b07a 100644
--- a/kmicromail/libetpan/pop3/mailpop3.c
+++ b/kmicromail/libetpan/pop3/mailpop3.c
@@ -495,34 +495,37 @@ int mailpop3_pass(mailpop3 * f, const char * password)
 
   if (f->pop3_state != POP3_STATE_AUTHORIZATION)
     return MAILPOP3_ERROR_BAD_STATE;
 
   /* send password command */
 
   snprintf(command, POP3_STRING_SIZE, "PASS %s\r\n", password);
   r = send_command(f, command);
   if (r == -1)
     return MAILPOP3_ERROR_STREAM;
 
   response = read_line(f);
   if (response == NULL)
     return MAILPOP3_ERROR_STREAM;
   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;
 
   return MAILPOP3_NO_ERROR;
 }
 
 static int read_list(mailpop3 * f, carray ** result);
 
 
 
 static int read_uidl(mailpop3 * f, carray * msg_tab);
 
 
 
 static int mailpop3_do_uidl(mailpop3 * f, carray * msg_tab)
 {
diff --git a/kmicromail/libetpan/tools/mailstream_helper.c b/kmicromail/libetpan/tools/mailstream_helper.c
index 146f955..92f4ffe 100644
--- a/kmicromail/libetpan/tools/mailstream_helper.c
+++ b/kmicromail/libetpan/tools/mailstream_helper.c
@@ -85,36 +85,43 @@ char * mailstream_read_line_append(mailstream * stream, MMAPString * line)
       while (i < stream->read_buffer_len) {
         if (stream->read_buffer[i] == '\n')
           return mailstream_read_len_append(stream, line, i + 1);
         i++;
       }
       if (mailstream_read_len_append(stream, line,
                                      stream->read_buffer_len) == NULL)
         return NULL;
     }
     else {
       ssize_t r;
       
       r = mailstream_feed_read_buffer(stream);
       if (r == -1)
         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);
 
   return line->str;
 }
 
 char * mailstream_read_line_remove_eol(mailstream * stream, MMAPString * line)
 {
   if (!mailstream_read_line(stream, line))
     return NULL;
 
   remove_trailing_eol(line);
 
   return line->str;
 }
 
 int mailstream_is_end_multiline(const char * line)