fixi

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
@@ -225,100 +225,103 @@ static int pop3driver_starttls(mailsession * session)
 
 static int pop3driver_parameters(mailsession * session,
     int id, void * value)
 {
   struct pop3_session_state_data * data;
 
   data = get_data(session);
 
   switch (id) {
   case POP3DRIVER_SET_AUTH_TYPE:
     {
       int * param;
 
       param = value;
 
       data->pop3_auth_type = * param;
       return MAIL_NO_ERROR;
     }
   }
 
   return MAIL_ERROR_INVAL;
 }
 
 static int pop3driver_login(mailsession * session,
 			    char * userid, char * password)
 {
   int r;
   carray * msg_tab;
   struct pop3_session_state_data * data;
 
   data = get_data(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);
 
-  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));
 
   return pop3driver_pop3_error_to_mail_error(r);
 }
 
 static int pop3driver_status_folder(mailsession * session, char * mb,
 				    uint32_t * result_messages,
 				    uint32_t * result_recent,
 				    uint32_t * result_unseen)
 {
   uint32_t count;
   int r;
   
   r = pop3driver_messages_number(session, mb, &count);
   if (r != MAIL_NO_ERROR)
     return r;
           
   * result_messages = count;
   * result_recent = count;
   * result_unseen = count;
   
   return MAIL_NO_ERROR;
 }
 
 static int pop3driver_messages_number(mailsession * session, char * mb,
 				      uint32_t * result)
 {
   carray * msg_tab;
 
   mailpop3_list(get_pop3_session(session), &msg_tab);
 
   * result = carray_count(msg_tab) -
     get_pop3_session(session)->pop3_deleted_count;
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
@@ -463,98 +463,101 @@ int mailpop3_apop(mailpop3 * f,
 int mailpop3_user(mailpop3 * f, const char * user)
 {
   char command[POP3_STRING_SIZE];
   int r;
   char * response;
 
   if (f->pop3_state != POP3_STATE_AUTHORIZATION)
     return MAILPOP3_ERROR_BAD_STATE;
   
   /* send user command */
     
   snprintf(command, POP3_STRING_SIZE, "USER %s\r\n", user);
   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)
     return MAILPOP3_ERROR_BAD_USER;
 
   return MAILPOP3_NO_ERROR;
 }
 
 int mailpop3_pass(mailpop3 * f, const char * password)
 {
   char command[POP3_STRING_SIZE];
   int r;
   char * response;
 
   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)
 {
   char command[POP3_STRING_SIZE];
   int r;
   char * response;
 
   if (f->pop3_state != POP3_STATE_TRANSACTION)
     return MAILPOP3_ERROR_BAD_STATE;
 
   /* send list command */
   
   snprintf(command, POP3_STRING_SIZE, "UIDL\r\n");
   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)
     return MAILPOP3_ERROR_CANT_LIST;
   
   r = read_uidl(f, msg_tab);
   if (r != MAILPOP3_NO_ERROR)
     return r;
 
   return MAILPOP3_NO_ERROR;
 }
 
 
 
 static int mailpop3_do_list(mailpop3 * f)
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
@@ -53,98 +53,105 @@ static void remove_trailing_eol(MMAPString * mmapstr)
 char * mailstream_read_line(mailstream * stream, MMAPString * line)
 {
   if (mmap_string_assign(line, "") == NULL)
     return NULL;
 
   return mailstream_read_line_append(stream, line);
 }
 
 static char * mailstream_read_len_append(mailstream * stream,
 					 MMAPString * line,
 					 size_t i)
 {
   size_t cur_size;
 
   cur_size = line->len;
   if (mmap_string_set_size(line, line->len + i) == NULL)
     return NULL;
   if (mailstream_read(stream, line->str + cur_size, i) < 0)
     return NULL;
   return line->str;
 }
 
 char * mailstream_read_line_append(mailstream * stream, MMAPString * line)
 {
   if (stream == NULL)
     return NULL;
 
   do {
     if (stream->read_buffer_len > 0) {
       size_t i;
 
       i = 0;
       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)
-        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;
 }
 
 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)
 {
   if (line[0] != '.')
     return FALSE;
   if (line[1] != 0)
     return FALSE;
   return TRUE;
 }
 
 #if 1
 char * mailstream_read_multiline(mailstream * s, size_t size,
 				  MMAPString * stream_buffer,
 				  MMAPString * multiline_buffer,
 				  size_t progr_rate,
 				  progress_function * progr_fun)
 {
   size_t count;
   char * line;
   size_t last;
 
   if (mmap_string_assign(multiline_buffer, "") == NULL)
     return NULL;
 
   count = 0;
   last = 0;
 
   while ((line = mailstream_read_line_remove_eol(s, stream_buffer)) != NULL) {
     if (mailstream_is_end_multiline(line))
       return multiline_buffer->str;
 
     if (line[0] == '.') {