adding a patch to fix 531430

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

diff --git a/url.c b/url.c
index 7ee67734cabbb5673cf31ba9131b3f4f35ea2862..58c3642138cbd42c1affac09cb72a42e1460f976 100644 (file)
--- a/url.c
+++ b/url.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2000 Thomas Roessler <roessler@does-not-exist.org>
+ * Copyright (C) 2000-2,2004 Thomas Roessler <roessler@does-not-exist.org>

  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by


@@ -144,7 +144,8 @@ static char *ciss_parse_userhost (ciss_url_t *ciss, char *src)
   if ((p = strchr (t, ':')))
   {
     *p++ = '\0';
   if ((p = strchr (t, ':')))
   {
     *p++ = '\0';

-    ciss->port = atoi (p);
+    if (mutt_atos (p, (short*) &ciss->port) < 0)
+      return NULL;

   }
   else
     ciss->port = 0;
   }
   else
     ciss->port = 0;


@@ -165,7 +166,8 @@ int url_parse_ciss (ciss_url_t *ciss, char *src)
 
   tmp = strchr (src, ':') + 1;
 
 
   tmp = strchr (src, ':') + 1;
 

-  ciss->path = ciss_parse_userhost (ciss, tmp);
+  if ((ciss->path = ciss_parse_userhost (ciss, tmp)) == NULL)
+    return -1;

   url_pct_decode (ciss->path);
   
   return 0;
   url_pct_decode (ciss->path);
   
   return 0;