[svn] Applied Edward Sabol's patch from

<200106131813.f5DIDss1294858@alderaan.gsfc.nasa.gov>.
It fixes a memory leak in url_equal, and comments it out,
as it's unused.

diff --git a/src/ChangeLog b/src/ChangeLog
index 29edda04e4ade366809a3c2e53e50c67c4b70296..d7dbddb73f190420115f8400225d7b344e385032 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-06-08  Edward J. Sabol  <sabol@alderaan.gsfc.nasa.gov>
+
+       * url.c (url_equal): Fix a memory leak when parseurl returns an
+       error on the second URL. Also, since url_equal is not used at the
+       moment, do not compile it.
+
+       * url.h: Ditto for the prototype of url_equal.
+
 2001-11-16  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * html-parse.c (map_html_tags): Support XML-style empty tags.

diff --git a/src/url.c b/src/url.c
index 3e19c83a7550beb7ec1f10604802857778c67093..cfa09f1694c5e3246cd4073ea520d9d57acb6d14 100644 (file)
--- a/src/url.c
+++ b/src/url.c
@@ -774,6 +774,8 @@ str_url (const struct urlinfo *u, int hide)
 
    Returns 1 if the URL1 is equivalent to URL2, 0 otherwise.  Also
    return 0 on error.  */
+/* Do not compile unused code. */
+#if 0
 int
 url_equal (const char *url1, const char *url2)
 {
@@ -792,6 +794,7 @@ url_equal (const char *url1, const char *url2)
   err = parseurl (url2, u2, 0);
   if (err != URLOK)
     {
+      freeurl (u1, 1);
       freeurl (u2, 1);
       return 0;
     }
@@ -800,6 +803,7 @@ url_equal (const char *url1, const char *url2)
   freeurl (u2, 1);
   return res;
 }
+#endif /* 0 */
 \f
 urlpos *
 get_urls_file (const char *file)

diff --git a/src/url.h b/src/url.h
index c28cd956f956bf0a6b8e334870df90c2257db442..c47da58c58366f7d98563222d7f5effb46fc4afa 100644 (file)
--- a/src/url.h
+++ b/src/url.h
@@ -104,7 +104,10 @@ int skip_uname PARAMS ((const char *));
 
 uerr_t parseurl PARAMS ((const char *, struct urlinfo *, int));
 char *str_url PARAMS ((const struct urlinfo *, int));
+/* url_equal is not currently used. */
+#if 0
 int url_equal PARAMS ((const char *, const char *));
+#endif /* 0 */
 
 urlpos *get_urls_file PARAMS ((const char *));
 urlpos *get_urls_html PARAMS ((const char *, const char *, int, int *));