584138-mx_update_context-segfault.patch: fix a segfault due to holes in IMAP headers...

[software/mutt-debian.git] / pop_lib.c

diff --git a/pop_lib.c b/pop_lib.c
index 4b06ab0af5a754236554a4857e605854590446e9..d8cc9eaa1cc3d684590a2ae889f8cd1001c52b3f 100644 (file)
--- a/pop_lib.c
+++ b/pop_lib.c
@@ -31,36 +31,45 @@
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <string.h>
 #include <unistd.h>
 #include <ctype.h>

+#include <netdb.h>

 
 /* given an POP mailbox name, return host, port, username and password */
 int pop_parse_path (const char* path, ACCOUNT* acct)
 {
   ciss_url_t url;
   char *c;
 
 /* given an POP mailbox name, return host, port, username and password */
 int pop_parse_path (const char* path, ACCOUNT* acct)
 {
   ciss_url_t url;
   char *c;

-  int ret = -1;
+  struct servent *service;

 
   /* Defaults */
   acct->flags = 0;
 
   /* Defaults */
   acct->flags = 0;

-  acct->port = POP_PORT;

   acct->type = M_ACCT_TYPE_POP;
   acct->type = M_ACCT_TYPE_POP;

+  acct->port = 0;

 
   c = safe_strdup (path);
   url_parse_ciss (&url, c);
 
 
   c = safe_strdup (path);
   url_parse_ciss (&url, c);
 

-  if (url.scheme == U_POP || url.scheme == U_POPS)
+  if ((url.scheme != U_POP && url.scheme != U_POPS) ||
+      mutt_account_fromurl (acct, &url) < 0)

   {
   {

-    if (url.scheme == U_POPS)
-    {
-      acct->flags |= M_ACCT_SSL;
-      acct->port = POP_SSL_PORT;
-    }
+    FREE(&c);
+    mutt_error(_("Invalid POP URL: %s\n"), path);
+    mutt_sleep(1);
+    return -1;
+  }

 
 

-    if ((!url.path || !*url.path) && mutt_account_fromurl (acct, &url) == 0)
-      ret = 0;
+  if (url.scheme == U_POPS)
+    acct->flags |= M_ACCT_SSL;
+
+  service = getservbyname (url.scheme == U_POP ? "pop3" : "pop3s", "tcp");
+  if (!acct->port) {
+    if (service)
+      acct->port = ntohs (service->s_port);
+    else
+      acct->port = url.scheme == U_POP ? POP_PORT : POP_SSL_PORT;;

   }
 
   FREE (&c);
   }
 
   FREE (&c);

-  return ret;
+  return 0;

 }
 
 /* Copy error message to err_msg buffer */
 }
 
 /* Copy error message to err_msg buffer */


@@ -489,7 +498,8 @@ int pop_fetch_data (POP_DATA *pop_data, char *query, progress_t *progressbar,
     strfcpy (inbuf + lenbuf, p, sizeof (buf));
     pos += chunk;
 
     strfcpy (inbuf + lenbuf, p, sizeof (buf));
     pos += chunk;
 

-    if (chunk >= sizeof (buf))
+    /* cast is safe since we break out of the loop when chunk<=0 */
+    if ((size_t)chunk >= sizeof (buf))

     {
       lenbuf += strlen (p);
     }
     {
       lenbuf += strlen (p);
     }