Fixed a typo; updated copyright notice

[privoxy.git] / urlmatch.c

diff --git a/urlmatch.c b/urlmatch.c
index f3aa6a6..45ddb98 100644 (file)
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -1,7 +1,7 @@
-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.10.2.1 2002/06/06 19:06:44 jongfoster Exp $";
+const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.10.2.6 2003/05/07 12:39:48 oes Exp $";
 /*********************************************************************
  *
- * File        :  $Source: /cvsroot/ijbswa//current/Attic/urlmatch.c,v $
+ * File        :  $Source: /cvsroot/ijbswa/current/Attic/urlmatch.c,v $
  *
  * Purpose     :  Declares functions to match URLs against URL
  *                patterns.
@@ -33,6 +33,25 @@ const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.10.2.1 2002/06/06 19:06:44 jong
  *
  * Revisions   :
  *    $Log: urlmatch.c,v $
+ *    Revision 1.10.2.6  2003/05/07 12:39:48  oes
+ *    Fix typo: Default port for https URLs is 443, not 143.
+ *    Thanks to Scott Tregear for spotting this one.
+ *
+ *    Revision 1.10.2.5  2003/02/28 13:09:29  oes
+ *    Fixed a rare double free condition as per Bug #694713
+ *
+ *    Revision 1.10.2.4  2003/02/28 12:57:44  oes
+ *    Moved freeing of http request structure to its owner
+ *    as per Dan Price's observations in Bug #694713
+ *
+ *    Revision 1.10.2.3  2002/11/12 16:50:40  oes
+ *    Fixed memory leak in parse_http_request() reported by Oliver Stoeneberg. Fixes bug #637073
+ *
+ *    Revision 1.10.2.2  2002/09/25 14:53:15  oes
+ *    Added basic support for OPTIONS and TRACE HTTP methods:
+ *    parse_http_url now recognizes the "*" URI as well as
+ *    the OPTIONS and TRACE method keywords.
+ *
  *    Revision 1.10.2.1  2002/06/06 19:06:44  jongfoster
  *    Adding support for proprietary Microsoft WebDAV extensions
  *
@@ -187,8 +206,15 @@ jb_err parse_http_url(const char * url,
     */  
    if (*http->url == '*')
    {
-      http->path = strdup("*");
-      http->hostport = strdup("");
+      if  ( NULL == (http->path = strdup("*"))
+         || NULL == (http->hostport = strdup("")) ) 
+      {
+         return JB_ERR_MEMORY;
+      }
+      if (http->url[1] != '\0')
+      {
+         return JB_ERR_PARSE;
+      }
       return JB_ERR_OK;
    }
 
@@ -249,13 +275,11 @@ jb_err parse_http_url(const char * url,
          http->hostport = strdup(url_noproto);
       }
 
-      free(buf);
+      freez(buf);
 
       if ( (http->path == NULL)
         || (http->hostport == NULL))
       {
-         free(buf);
-         free_http_request(http);
          return JB_ERR_MEMORY;
       }
    }
@@ -272,7 +296,6 @@ jb_err parse_http_url(const char * url,
       buf = strdup(http->hostport);
       if (buf == NULL)
       {
-         free_http_request(http);
          return JB_ERR_MEMORY;
       }
 
@@ -301,7 +324,7 @@ jb_err parse_http_url(const char * url,
       else
       {
          /* No port specified. */
-         http->port = (http->ssl ? 143 : 80);
+         http->port = (http->ssl ? 443 : 80);
       }
 
       http->host = strdup(host);
@@ -310,7 +333,6 @@ jb_err parse_http_url(const char * url,
 
       if (http->host == NULL)
       {
-         free_http_request(http);
          return JB_ERR_MEMORY;
       }
    }
@@ -327,7 +349,6 @@ jb_err parse_http_url(const char * url,
       http->dbuffer = strdup(http->host);
       if (NULL == http->dbuffer)
       {
-         free_http_request(http);
          return JB_ERR_MEMORY;
       }
 
@@ -346,7 +367,6 @@ jb_err parse_http_url(const char * url,
           * Error: More than SZ(vec) components in domain
           *    or: no components in domain
           */
-         free_http_request(http);
          return JB_ERR_PARSE;
       }
 
@@ -356,7 +376,6 @@ jb_err parse_http_url(const char * url,
       http->dvec = (char **)malloc(size);
       if (NULL == http->dvec)
       {
-         free_http_request(http);
          return JB_ERR_MEMORY;
       }
 
@@ -484,11 +503,12 @@ jb_err parse_http_request(const char *req,
      || (http->ver == NULL) )
    {
       free(buf);
-      free_http_request(http);
       return JB_ERR_MEMORY;
    }
 
+   free(buf);
    return JB_ERR_OK;
+
 }
 
 
@@ -616,7 +636,7 @@ static int domain_match(const struct url_spec *pattern, const struct http_reques
  * Function    :  create_url_spec
  *
  * Description :  Creates a "url_spec" structure from a string.
- *                When finished, free with unload_url().
+ *                When finished, free with free_url_spec().
  *
  * Parameters  :
  *          1  :  url = Target url_spec to be filled in.  Will be
@@ -641,10 +661,14 @@ jb_err create_url_spec(struct url_spec * url, const char * buf)
    assert(url);
    assert(buf);
 
-   /* Zero memory */
+   /*
+    * Zero memory
+    */
    memset(url, '\0', sizeof(*url));
 
-   /* save a copy of the orignal specification */
+   /*
+    * Save a copy of the orignal specification
+    */
    if ((url->spec = strdup(buf)) == NULL)
    {
       return JB_ERR_MEMORY;
@@ -718,7 +742,9 @@ jb_err create_url_spec(struct url_spec * url, const char * buf)
       char *v[150];
       size_t size;
 
-      /* Parse domain part */
+      /*
+       * Parse domain part
+       */
       if (buf[strlen(buf) - 1] == '.')
       {
          url->unanchored |= ANCHOR_RIGHT;
@@ -728,8 +754,9 @@ jb_err create_url_spec(struct url_spec * url, const char * buf)
          url->unanchored |= ANCHOR_LEFT;
       }
 
-      /* split domain into components */
-
+      /* 
+       * Split domain into components
+       */
       url->dbuffer = strdup(buf);
       if (NULL == url->dbuffer)
       {
@@ -740,13 +767,17 @@ jb_err create_url_spec(struct url_spec * url, const char * buf)
          return JB_ERR_MEMORY;
       }
 
-      /* map to lower case */
+      /* 
+       * Map to lower case
+       */
       for (p = url->dbuffer; *p ; p++)
       {
          *p = tolower((int)(unsigned char)*p);
       }
 
-      /* split the domain name into components */
+      /* 
+       * Split the domain name into components
+       */
       url->dcount = ssplit(url->dbuffer, ".", v, SZ(v), 1, 1);
 
       if (url->dcount < 0)
@@ -762,7 +793,9 @@ jb_err create_url_spec(struct url_spec * url, const char * buf)
       else if (url->dcount != 0)
       {
 
-         /* save a copy of the pointers in dvec */
+         /* 
+          * Save a copy of the pointers in dvec
+          */
          size = url->dcount * sizeof(*url->dvec);
 
          url->dvec = (char **)malloc(size);
@@ -779,6 +812,11 @@ jb_err create_url_spec(struct url_spec * url, const char * buf)
 
          memcpy(url->dvec, v, size);
       }
+      /*
+       * else dcount == 0 in which case we needn't do anything,
+       * since dvec will never be accessed and the pattern will
+       * match all domains.
+       */
    }
 
    return JB_ERR_OK;