Forget about JB_ERR_PARSE. JB_ERR_CGI_PARAMS to the rescue.

[privoxy.git] / urlmatch.c

diff --git a/urlmatch.c b/urlmatch.c
index 37d0f3f..77c6391 100644 (file)
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -1,4 +1,4 @@
-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.36 2008/04/14 18:19:48 fabiankeil Exp $";
+const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.39 2008/04/22 16:27:42 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/urlmatch.c,v $
@@ -33,6 +33,17 @@ const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.36 2008/04/14 18:19:48 fabianke
  *
  * Revisions   :
  *    $Log: urlmatch.c,v $
+ *    Revision 1.39  2008/04/22 16:27:42  fabiankeil
+ *    In parse_http_request(), remove a pointless
+ *    temporary variable and free the buffer earlier.
+ *
+ *    Revision 1.38  2008/04/18 05:17:18  fabiankeil
+ *    Mark simplematch()'s parameters as immutable.
+ *
+ *    Revision 1.37  2008/04/17 14:53:29  fabiankeil
+ *    Move simplematch() into urlmatch.c as it's only
+ *    used to match (old-school) domain patterns.
+ *
  *    Revision 1.36  2008/04/14 18:19:48  fabiankeil
  *    Remove now-pointless cast in create_url_spec().
  *
@@ -525,7 +536,7 @@ jb_err parse_http_url(const char * url,
 
       http->host = strdup(host);
 
-      free(buf);
+      freez(buf);
 
       if (http->host == NULL)
       {
@@ -621,7 +632,6 @@ jb_err parse_http_request(const char *req,
    char *v[10]; /* XXX: Why 10? We should only need three. */
    int n;
    jb_err err;
-   int is_connect = 0;
 
    memset(http, '\0', sizeof(*http));
 
@@ -634,7 +644,7 @@ jb_err parse_http_request(const char *req,
    n = ssplit(buf, " \r\n", v, SZ(v), 1, 1);
    if (n != 3)
    {
-      free(buf);
+      freez(buf);
       return JB_ERR_PARSE;
    }
 
@@ -650,39 +660,34 @@ jb_err parse_http_request(const char *req,
    if (unknown_method(v[0]))
    {
       log_error(LOG_LEVEL_ERROR, "Unknown HTTP method detected: %s", v[0]);
-      free(buf);
+      freez(buf);
       return JB_ERR_PARSE;
    }
 
-   if (strcmpic(v[0], "CONNECT") == 0)
-   {
-      is_connect = 1;
-   }
-
    err = parse_http_url(v[1], http, csp);
    if (err)
    {
-      free(buf);
+      freez(buf);
       return err;
    }
 
    /*
     * Copy the details into the structure
     */
-   http->ssl = is_connect;
+   http->ssl = !strcmpic(v[0], "CONNECT");
    http->cmd = strdup(req);
    http->gpc = strdup(v[0]);
    http->ver = strdup(v[2]);
 
+   freez(buf);
+
    if ( (http->cmd == NULL)
      || (http->gpc == NULL)
      || (http->ver == NULL) )
    {
-      free(buf);
       return JB_ERR_MEMORY;
    }
 
-   free(buf);
    return JB_ERR_OK;
 
 }
@@ -962,11 +967,11 @@ static jb_err compile_host_pattern(struct url_spec *url, const char *host_patter
  * Returns     :  0 if match, else nonzero
  *
  *********************************************************************/
-static int simplematch(char *pattern, char *text)
+static int simplematch(const char *pattern, const char *text)
 {
-   unsigned char *pat = (unsigned char *) pattern;
-   unsigned char *txt = (unsigned char *) text;
-   unsigned char *fallback = pat; 
+   const unsigned char *pat = (const unsigned char *)pattern;
+   const unsigned char *txt = (const unsigned char *)text;
+   const unsigned char *fallback = pat; 
    int wildcard = 0;
   
    unsigned char lastchar = 'a';
@@ -1374,7 +1379,7 @@ int match_portlist(const char *portlist, int port)
           */
          if (port == atoi(min))
          {
-            free(portlist_copy);
+            freez(portlist_copy);
             return(1);
          }
       }
@@ -1387,7 +1392,7 @@ int match_portlist(const char *portlist, int port)
          *max++ = '\0';
          if(port >= atoi(min) && port <= (atoi(max) ? atoi(max) : 65535))
          {
-            free(portlist_copy);
+            freez(portlist_copy);
             return(1);
          }
 
@@ -1407,7 +1412,7 @@ int match_portlist(const char *portlist, int port)
       }
    }
 
-   free(portlist_copy);
+   freez(portlist_copy);
    return 0;
 
 }