3 files changed, 19 insertions, 6 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
@@ -267,16 +267,19 @@ static int pop3driver_login(mailsession * session,
 
   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);
 
-  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;
 
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
@@ -505,14 +505,17 @@ int mailpop3_pass(mailpop3 * f, const char * password)
 
   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;
 }
 
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
@@ -95,14 +95,21 @@ char * mailstream_read_line_append(mailstream * stream, MMAPString * line)
       ssize_t r;
       
       r = mailstream_feed_read_buffer(stream);
       if (r == -1)
         return NULL;
 
-      if (r == 0)
-        break;
+      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;
 }