-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.63 2011/09/04 11:37:05 fabiankeil Exp $";
+const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.74 2012/12/07 12:49:20 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/urlmatch.c,v $
* Purpose : Declares functions to match URLs against URL
* patterns.
*
- * Copyright : Written by and Copyright (C) 2001-2009
+ * Copyright : Written by and Copyright (C) 2001-2011
* the Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* 1 : http = pointer to the http structure to hold elements.
*
* Returns : JB_ERR_OK on success
- * JB_ERR_MEMORY on out of memory
* JB_ERR_PARSE on malformed command/URL
* or >100 domains deep.
*
size_t size;
char *p;
- http->dbuffer = strdup(http->host);
- if (NULL == http->dbuffer)
- {
- return JB_ERR_MEMORY;
- }
+ http->dbuffer = strdup_or_die(http->host);
/* map to lower case */
for (p = http->dbuffer; *p ; p++)
{
- *p = (char)tolower((int)(unsigned char)*p);
+ *p = (char)privoxy_tolower(*p);
}
/* split the domain name into components */
- http->dcount = ssplit(http->dbuffer, ".", vec, SZ(vec), 1, 1);
+ http->dcount = ssplit(http->dbuffer, ".", vec, SZ(vec));
if (http->dcount <= 0)
{
/* save a copy of the pointers in dvec */
size = (size_t)http->dcount * sizeof(*http->dvec);
- http->dvec = (char **)malloc(size);
- if (NULL == http->dvec)
- {
- return JB_ERR_MEMORY;
- }
+ http->dvec = malloc_or_die(size);
memcpy(http->dvec, vec, size);
* protocol are acceptable.
*
* Returns : JB_ERR_OK on success
- * JB_ERR_MEMORY on out of memory
* JB_ERR_PARSE on malformed command/URL
* or >100 domains deep.
*
/*
* Save our initial URL
*/
- http->url = strdup(url);
- if (http->url == NULL)
- {
- return JB_ERR_MEMORY;
- }
-
+ http->url = strdup_or_die(url);
/*
* Check for * URI. If found, we're done.
*/
if (*http->url == '*')
{
- if ( NULL == (http->path = strdup("*"))
- || NULL == (http->hostport = strdup("")) )
- {
- return JB_ERR_MEMORY;
- }
+ http->path = strdup_or_die("*");
+ http->hostport = strdup_or_die("");
if (http->url[1] != '\0')
{
return JB_ERR_PARSE;
char *url_noproto;
char *url_path;
- buf = strdup(url);
- if (buf == NULL)
- {
- return JB_ERR_MEMORY;
- }
+ buf = strdup_or_die(url);
/* Find the start of the URL in our scratch space */
url_noproto = buf;
* https URL in and it's parsed by the function. (When the
* URL is actually retrieved, SSL hides the path part).
*/
- http->path = strdup(http->ssl ? "/" : url_path);
+ http->path = strdup_or_die(http->ssl ? "/" : url_path);
*url_path = '\0';
- http->hostport = strdup(url_noproto);
+ http->hostport = strdup_or_die(url_noproto);
}
else
{
* Repair broken HTTP requests that don't contain a path,
* or CONNECT requests
*/
- http->path = strdup("/");
- http->hostport = strdup(url_noproto);
+ http->path = strdup_or_die("/");
+ http->hostport = strdup_or_die(url_noproto);
}
freez(buf);
-
- if ( (http->path == NULL)
- || (http->hostport == NULL))
- {
- return JB_ERR_MEMORY;
- }
}
if (!host_available)
char *host;
char *port;
- buf = strdup(http->hostport);
- if (buf == NULL)
- {
- return JB_ERR_MEMORY;
- }
+ buf = strdup_or_die(http->hostport);
/* check if url contains username and/or password */
host = strchr(buf, '@');
if (port != NULL)
{
/* Contains port */
+ char *endptr;
+ long parsed_port;
/* Terminate hostname and point to start of port string */
*port++ = '\0';
- http->port = atoi(port);
+ parsed_port = strtol(port, &endptr, 10);
+ if ((parsed_port <= 0) || (parsed_port > 65535) || (*endptr != '\0'))
+ {
+ log_error(LOG_LEVEL_ERROR, "Invalid port in URL: %s.", url);
+ freez(buf);
+ return JB_ERR_PARSE;
+ }
+ http->port = (int)parsed_port;
}
else
{
http->port = (http->ssl ? 443 : 80);
}
- http->host = strdup(host);
+ http->host = strdup_or_die(host);
freez(buf);
-
- if (http->host == NULL)
- {
- return JB_ERR_MEMORY;
- }
}
#ifdef FEATURE_EXTENDED_HOST_PATTERNS
* 2 : http = pointer to the http structure to hold elements
*
* Returns : JB_ERR_OK on success
- * JB_ERR_MEMORY on out of memory
* JB_ERR_CGI_PARAMS on malformed command/URL
* or >100 domains deep.
*
memset(http, '\0', sizeof(*http));
- buf = strdup(req);
- if (buf == NULL)
- {
- return JB_ERR_MEMORY;
- }
+ buf = strdup_or_die(req);
- n = ssplit(buf, " \r\n", v, SZ(v), 1, 1);
+ n = ssplit(buf, " \r\n", v, SZ(v));
if (n != 3)
{
freez(buf);
/*
* Copy the details into the structure
*/
- http->cmd = strdup(req);
- http->gpc = strdup(v[0]);
- http->ver = strdup(v[2]);
+ http->cmd = strdup_or_die(req);
+ http->gpc = strdup_or_die(v[0]);
+ http->ver = strdup_or_die(v[2]);
freez(buf);
- if ( (http->cmd == NULL)
- || (http->gpc == NULL)
- || (http->ver == NULL) )
- {
- return JB_ERR_MEMORY;
- }
-
return JB_ERR_OK;
}
if (NULL != p)
{
*p++ = '\0';
- url->port_list = strdup(p);
- if (NULL == url->port_list)
- {
- return JB_ERR_MEMORY;
- }
+ url->port_list = strdup_or_die(p);
}
else
{
*
* Function : compile_host_pattern
*
- * Description : Parses and compiles a host pattern..
+ * Description : Parses and compiles a host pattern.
*
* Parameters :
* 1 : url = Target url_spec to be filled in.
* 2 : host_pattern = Host pattern to parse.
*
* Returns : JB_ERR_OK - Success
- * JB_ERR_MEMORY - Out of memory
* JB_ERR_PARSE - Cannot parse regex
*
*********************************************************************/
/*
* Split domain into components
*/
- url->dbuffer = strdup(host_pattern);
- if (NULL == url->dbuffer)
- {
- free_url_spec(url);
- return JB_ERR_MEMORY;
- }
+ url->dbuffer = strdup_or_die(host_pattern);
/*
* Map to lower case
*/
for (p = url->dbuffer; *p ; p++)
{
- *p = (char)tolower((int)(unsigned char)*p);
+ *p = (char)privoxy_tolower(*p);
}
/*
* Split the domain name into components
*/
- url->dcount = ssplit(url->dbuffer, ".", v, SZ(v), 1, 1);
+ url->dcount = ssplit(url->dbuffer, ".", v, SZ(v));
if (url->dcount < 0)
{
free_url_spec(url);
- return JB_ERR_MEMORY;
+ return JB_ERR_PARSE;
}
else if (url->dcount != 0)
{
*/
size = (size_t)url->dcount * sizeof(*url->dvec);
- url->dvec = (char **)malloc(size);
- if (NULL == url->dvec)
- {
- free_url_spec(url);
- return JB_ERR_MEMORY;
- }
+ url->dvec = malloc_or_die(size);
memcpy(url->dvec, v, size);
}
/*
* Char match, or char range match?
*/
- if ( (*pat == *txt)
- || (*pat == '?')
- || ((*pat == ']') && (charmap[*txt / 8] & (1 << (*txt % 8)))) )
+ if ((*pat == *txt)
+ || (*pat == '?')
+ || ((*pat == ']') && (charmap[*txt / 8] & (1 << (*txt % 8)))))
{
/*
* Success: Go ahead
}
/* Cut off extra '*'s */
- if(*pat == '*') pat++;
+ if (*pat == '*') pat++;
/* If this is the pattern's end, fine! */
return(*pat);
* are lost forever.
*
* Returns : JB_ERR_OK - Success
- * JB_ERR_MEMORY - Out of memory
* JB_ERR_PARSE - Cannot parse regex (Detailed message
* written to system log)
*
memset(url, '\0', sizeof(*url));
/* Remember the original specification for the CGI pages. */
- url->spec = strdup(buf);
- if (NULL == url->spec)
- {
- return JB_ERR_MEMORY;
- }
+ url->spec = strdup_or_die(buf);
/* Is it a tag pattern? */
if (0 == strncmpic(url->spec, "TAG:", 4))
{
char *min, *max, *next, *portlist_copy;
- min = portlist_copy = strdup(portlist);
+ min = portlist_copy = strdup_or_die(portlist);
/*
* Zero-terminate first item and remember offset for next
* or, if max was omitted, between min and 65K
*/
*max++ = '\0';
- if(port >= atoi(min) && port <= (atoi(max) ? atoi(max) : 65535))
+ if (port >= atoi(min) && port <= (atoi(max) ? atoi(max) : 65535))
{
freez(portlist_copy);
return(1);
return JB_ERR_PARSE;
}
- *hostname = strdup(address);
- if (NULL == *hostname)
- {
- return JB_ERR_MEMORY;
- }
+ *hostname = strdup_or_die(address);
if ((**hostname == '[') && (NULL != (p = strchr(*hostname, ']'))))
{
projects / privoxy.git / blobdiff