-const char filters_rcs[] = "$Id: filters.c,v 1.28 2001/09/10 10:18:51 oes Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.38 2001/10/23 21:32:33 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/filters.c,v $
* IJBSWA team. http://ijbswa.sourceforge.net
*
* Based on the Internet Junkbuster originally written
- * by and Copyright (C) 1997 Anonymous Coders and
+ * by and Copyright (C) 1997 Anonymous Coders and
* Junkbusters Corporation. http://www.junkbusters.com
*
- * This program is free software; you can redistribute it
+ * 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 the Free Software
* Foundation; either version 2 of the License, or (at
*
* Revisions :
* $Log: filters.c,v $
+ * Revision 1.38 2001/10/23 21:32:33 jongfoster
+ * Adding error-checking to selected functions
+ *
+ * Revision 1.37 2001/10/22 15:33:56 david__schmidt
+ * Special-cased OS/2 out of the Netscape-abort-on-404-in-js problem in
+ * filters.c. Added a FIXME in front of the offending code. I'll gladly
+ * put in a better/more robust fix for all parties if one is presented...
+ * It seems that just returning 200 instead of 404 would pretty much fix
+ * it for everyone, but I don't know all the history of the problem.
+ *
+ * Revision 1.36 2001/10/10 16:44:16 oes
+ * Added match_portlist function
+ *
+ * Revision 1.35 2001/10/07 15:41:23 oes
+ * Replaced 6 boolean members of csp with one bitmap (csp->flags)
+ *
+ * New function remove_chunked_transfer_coding that strips chunked
+ * transfer coding to plain and is called by pcrs_filter_response
+ * and gif_deanimate_response if neccessary
+ *
+ * Improved handling of zero-change re_filter runs
+ *
+ * pcrs_filter_response and gif_deanimate_response now remove
+ * chunked transfer codeing before processing the body.
+ *
+ * Revision 1.34 2001/09/20 15:49:36 steudten
+ *
+ * Fix BUG: Change int size to size_t size in pcrs_filter_response().
+ * See cgi.c fill_template().
+ *
+ * Revision 1.33 2001/09/16 17:05:14 jongfoster
+ * Removing unused #include showarg.h
+ *
+ * Revision 1.32 2001/09/16 13:21:27 jongfoster
+ * Changes to use new list functions.
+ *
+ * Revision 1.31 2001/09/16 11:38:02 jongfoster
+ * Splitting fill_template() into 2 functions:
+ * template_load() loads the file
+ * template_fill() performs the PCRS regexps.
+ * This is because the CGI edit interface has a "table row"
+ * template which is used many times in the page - this
+ * change means it's only loaded from disk once.
+ *
+ * Revision 1.30 2001/09/16 11:00:10 jongfoster
+ * New function alloc_http_response, for symmetry with free_http_response
+ *
+ * Revision 1.29 2001/09/13 23:32:40 jongfoster
+ * Moving image data to cgi.c rather than cgi.h
+ * Fixing a GPF under Win32 (and any other OS that protects global
+ * constants from being written to).
+ *
* Revision 1.28 2001/09/10 10:18:51 oes
* Silenced compiler warnings
*
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
+#include <assert.h>
#ifndef _WIN32
+#ifndef __OS2__
#include <unistd.h>
+#endif /* ndef __OS2__ */
#include <netinet/in.h>
#else
#include <winsock2.h>
-#endif
+#endif /* ndef _WIN32 */
+
+#ifdef __OS2__
+#include <utils.h>
+#endif /* def __OS2__ */
#include "project.h"
#include "filters.h"
#include "encode.h"
-#include "jcc.h"
-#include "showargs.h"
#include "parsers.h"
#include "ssplit.h"
-#include "gateway.h"
-#include "jbsockets.h"
#include "errlog.h"
#include "jbsockets.h"
#include "miscutil.h"
#endif /* def FEATURE_ACL */
+/*********************************************************************
+ *
+ * Function : match_portlist
+ *
+ * Description : Check if a given number is covered by a comma
+ * separated list of numbers and ranges (a,b-c,d,..)
+ *
+ * Parameters :
+ * 1 : portlist = String with list
+ * 2 : port = port to check
+ *
+ * Returns : 0 => no match
+ * 1 => match
+ *
+ *********************************************************************/
+int match_portlist(const char *portlist, int port)
+{
+ char *min, *max, *next, *portlist_copy;
+
+ min = next = portlist_copy = strdup(portlist);
+
+ /*
+ * Zero-terminate first item and remember offset for next
+ */
+ if (NULL != (next = strchr(portlist_copy, (int) ',')))
+ {
+ *next++ = '\0';
+ }
+
+ /*
+ * Loop through all items, checking for match
+ */
+ while(min)
+ {
+ if (NULL == (max = strchr(min, (int) '-')))
+ {
+ /*
+ * No dash, check for equality
+ */
+ if (port == atoi(min))
+ {
+ free(portlist_copy);
+ return(1);
+ }
+ }
+ else
+ {
+ /*
+ * This is a range, so check if between min and max,
+ * or, if max was omitted, between min and 65K
+ */
+ *max++ = '\0';
+ if(port >= atoi(min) && port <= (atoi(max) ? atoi(max) : 65535))
+ {
+ free(portlist_copy);
+ return(1);
+ }
+
+ }
+
+ /*
+ * Jump to next item
+ */
+ min = next;
+
+ /*
+ * Zero-terminate next item and remember offset for n+1
+ */
+ if ((NULL != next) && (NULL != (next = strchr(next, (int) ','))))
+ {
+ *next++ = '\0';
+ }
+ }
+
+ free(portlist_copy);
+ return 0;
+
+}
+
+
/*********************************************************************
*
* Function : block_url
#endif /* def FEATURE_IMAGE_BLOCKING */
struct http_response *rsp;
- /*
+ /*
* If it's not blocked, don't block it ;-)
*/
if ((csp->action->flags & ACTION_BLOCK) == 0)
{
- return(NULL);
+ return NULL;
}
- /*
+ /*
* Else, prepare a response
*/
- if (NULL == ( rsp = (struct http_response *)zalloc(sizeof(*rsp))))
+ if (NULL == (rsp = alloc_http_response()))
{
- return NULL;
+ return cgi_error_memory();
}
/*
if ((p == NULL) || (0 == strcmpic(p, "logo")))
{
rsp->body = bindup(image_junkbuster_gif_data, image_junkbuster_gif_length);
+ if (rsp->body == NULL)
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
rsp->content_length = image_junkbuster_gif_length;
- enlist_unique_header(rsp->headers, "Content-Type", "image/gif");
+
+ if (enlist_unique_header(rsp->headers, "Content-Type", "image/gif"))
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
}
else if (0 == strcmpic(p, "blank"))
{
rsp->body = bindup(image_blank_gif_data, image_blank_gif_length);
+ if (rsp->body == NULL)
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
rsp->content_length = image_blank_gif_length;
- enlist_unique_header(rsp->headers, "Content-Type", "image/gif");
+
+ if (enlist_unique_header(rsp->headers, "Content-Type", "image/gif"))
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
}
else
{
rsp->status = strdup("302 Local Redirect from Junkbuster");
- enlist_unique_header(rsp->headers, "Location", p);
+ if (rsp->status == NULL)
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
+
+ if (enlist_unique_header(rsp->headers, "Location", p))
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
}
- }
+ }
else
#endif /* def FEATURE_IMAGE_BLOCKING */
- /*
+ /*
* Else, generate an HTML "blocked" message:
*/
{
- struct map * exports = default_exports(csp, NULL);
-#ifdef FEATURE_FORCE_LOAD
- map(exports, "force-prefix", 1, FORCE_PREFIX, 1);
-#else /* ifndef FEATURE_FORCE_LOAD */
- map_block_killer(exports, "force-support");
-#endif /* ndef FEATURE_FORCE_LOAD */
-
- map(exports, "hostport", 1, csp->http->hostport, 1);
- map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0);
- map(exports, "path", 1, csp->http->path, 1);
- map(exports, "path-html", 1, html_encode(csp->http->path), 0);
+ jb_err err;
+ struct map * exports;
- rsp->body = fill_template(csp, "blocked", exports);
- free_map(exports);
-
+ /* FIXME */
+#ifdef __EMX__
+ /*
+ * The entire OS/2 community will hit the stupid Netscape bug
+ * (all three of us! :-) so we'll just keep ourselves out
+ * of this contentious debate and special-case ourselves.
+ * The problem is... a this point in parsing, we don't know
+ * what the csp->http->user_agent is (yet). So we can't use
+ * it to decide if we should work around the NS bug or not.
+ */
+ rsp->status = strdup("200 Request for blocked URL");
+#else
/*
* Workaround for stupid Netscape bug which prevents
* pages from being displayed if loading a referenced
&& !strstr(csp->http->user_agent, "compatible")
&& !strstr(csp->http->user_agent, "Opera"))
{
- rsp->status = strdup("200 Request for blocked URL");
+ rsp->status = strdup("200 Request for blocked URL");
}
else
{
- rsp->status = strdup("404 Request for blocked URL");
+ rsp->status = strdup("404 Request for blocked URL");
+ }
+#endif /* __EMX__ */
+ if (rsp->status == NULL)
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
+
+ exports = default_exports(csp, NULL);
+ if (exports == NULL)
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
+
+#ifdef FEATURE_FORCE_LOAD
+ err = map(exports, "force-prefix", 1, FORCE_PREFIX, 1);
+#else /* ifndef FEATURE_FORCE_LOAD */
+ err = map_block_killer(exports, "force-support");
+#endif /* ndef FEATURE_FORCE_LOAD */
+
+ err = err || map(exports, "hostport", 1, csp->http->hostport, 1);
+ err = err || map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0);
+ err = err || map(exports, "path", 1, csp->http->path, 1);
+ err = err || map(exports, "path-html", 1, html_encode(csp->http->path), 0);
+
+ if (err)
+ {
+ free_map(exports);
+ free_http_response(rsp);
+ return cgi_error_memory();
}
+ err = template_fill_for_cgi(csp, "blocked", exports, rsp);
+ if (err)
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
}
- return(finish_http_response(rsp));
+ return finish_http_response(rsp);
}
{
struct http_response *rsp;
struct map * exports;
- char buf[BUFFER_SIZE], *p = NULL;
- struct url_spec **tl, *t;
+ char buf[BUFFER_SIZE];
+ char *p;
+ struct url_spec **tl;
+ struct url_spec *t;
+ jb_err err;
/*
* Don't bother to work on trusted URLs
return NULL;
}
- /*
+ /*
* Else, prepare a response:
*/
- if (NULL == ( rsp = (struct http_response *)zalloc(sizeof(*rsp))))
+ if (NULL == (rsp = alloc_http_response()))
{
- return NULL;
+ return cgi_error_memory();
}
exports = default_exports(csp, NULL);
+ if (exports == NULL)
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
- /*
+ /*
* Export the host, port, and referrer information
*/
- map(exports, "hostport", 1, csp->http->hostport, 1);
- map(exports, "path", 1, csp->http->path, 1);
- map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0);
- map(exports, "path-html", 1, html_encode(csp->http->path), 0);
+ err = map(exports, "hostport", 1, csp->http->hostport, 1)
+ || map(exports, "path", 1, csp->http->path, 1)
+ || map(exports, "hostport-html", 1, html_encode(csp->http->hostport), 0)
+ || map(exports, "path-html", 1, html_encode(csp->http->path), 0);
if (csp->referrer && strlen(csp->referrer) > 9)
{
- map(exports, "referrer", 1, csp->referrer + 9, 1);
- map(exports, "referrer-html", 1, html_encode(csp->referrer + 9), 0);
+ err = err || map(exports, "referrer", 1, csp->referrer + 9, 1);
+ err = err || map(exports, "referrer-html", 1, html_encode(csp->referrer + 9), 0);
}
else
{
- map(exports, "referrer", 1, "unknown", 1);
- map(exports, "referrer-html", 1, "unknown", 1);
+ err = err || map(exports, "referrer", 1, "unknown", 1);
+ err = err || map(exports, "referrer-html", 1, "unknown", 1);
+ }
+
+ if (err)
+ {
+ free_map(exports);
+ free_http_response(rsp);
+ return cgi_error_memory();
}
/*
* Export the trust list
*/
+ p = strdup("");
for (tl = csp->config->trust_list; (t = *tl) ; tl++)
{
sprintf(buf, "<li>%s</li>\n", t->spec);
- p = strsav(p, buf);
+ string_append(&p, buf);
+ }
+ err = map(exports, "trusted-referrers", 1, p, 0);
+
+ if (err)
+ {
+ free_map(exports);
+ free_http_response(rsp);
+ return cgi_error_memory();
}
- map(exports, "trusted-referrers", 1, p, 0);
- p = NULL;
/*
* Export the trust info, if available
*/
- if (csp->config->trust_info->next)
+ if (csp->config->trust_info->first)
{
- struct list *l;
+ struct list_entry *l;
- for (l = csp->config->trust_info->next; l ; l = l->next)
+ p = strdup("");
+ for (l = csp->config->trust_info->first; l ; l = l->next)
{
sprintf(buf, "<li> <a href=%s>%s</a><br>\n",l->str, l->str);
- p = strsav(p, buf);
+ string_append(&p, buf);
}
- map(exports, "trust-info", 1, p, 0);
+ err = map(exports, "trust-info", 1, p, 0);
}
else
{
- map_block_killer(exports, "have-trust-info");
+ err = map_block_killer(exports, "have-trust-info");
+ }
+
+ if (err)
+ {
+ free_map(exports);
+ free_http_response(rsp);
+ return cgi_error_memory();
}
-
+
/*
* Export the force prefix or the force conditional block killer
*/
#ifdef FEATURE_FORCE_LOAD
- map(exports, "force-prefix", 1, FORCE_PREFIX, 1);
+ err = map(exports, "force-prefix", 1, FORCE_PREFIX, 1);
#else /* ifndef FEATURE_FORCE_LOAD */
- map_block_killer(exports, "force-support");
+ err = map_block_killer(exports, "force-support");
#endif /* ndef FEATURE_FORCE_LOAD */
+ if (err)
+ {
+ free_map(exports);
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
+
/*
* Build the response
*/
- rsp->body = fill_template(csp, "untrusted", exports);
- free_map(exports);
-
- return(finish_http_response(rsp));
+ err = template_fill_for_cgi(csp, "untrusted", exports, rsp);
+ if (err)
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
+ return finish_http_response(rsp);
}
#endif /* def FEATURE_TRUST */
p = q = csp->http->path;
log_error(LOG_LEVEL_REDIRECTS, "checking path for redirects: %s", p);
- /*
+ /*
* find the last URL encoded in the request
*/
while ((p = strstr(p, "http://")))
q = p++;
}
- /*
+ /*
* if there was any, generate and return a HTTP redirect
*/
if (q != csp->http->path)
{
log_error(LOG_LEVEL_REDIRECTS, "redirecting to: %s", q);
- if (NULL == ( rsp = zalloc(sizeof(*rsp))))
+ if (NULL == (rsp = alloc_http_response()))
{
- return NULL;
+ return cgi_error_memory();
}
- rsp->status = strdup("302 Local Redirect from Junkbuster");
- enlist_unique_header(rsp->headers, "Location", q);
+ if ( enlist_unique_header(rsp->headers, "Location", q)
+ || (NULL == (rsp->status = strdup("302 Local Redirect from Junkbuster"))) )
+ {
+ free_http_response(rsp);
+ return cgi_error_memory();
+ }
- return(finish_http_response(rsp));
+ return finish_http_response(rsp);
}
else
{
- return(NULL);
+ return NULL;
}
}
* using either the info from a previous +image action
* or, #ifdef FEATURE_IMAGE_DETECT_MSIE, the info from
* the browser's accept header.
- *
+ *
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
int is_imageurl(struct client_state *csp)
{
#ifdef FEATURE_IMAGE_DETECT_MSIE
- if ((csp->accept_types
+ if ((csp->accept_types
& (ACCEPT_TYPE_IS_MSIE|ACCEPT_TYPE_MSIE_IMAGE|ACCEPT_TYPE_MSIE_HTML))
== (ACCEPT_TYPE_IS_MSIE|ACCEPT_TYPE_MSIE_IMAGE))
{
return 1;
}
- else if ((csp->accept_types
+ else if ((csp->accept_types
& (ACCEPT_TYPE_IS_MSIE|ACCEPT_TYPE_MSIE_IMAGE|ACCEPT_TYPE_MSIE_HTML))
== (ACCEPT_TYPE_IS_MSIE|ACCEPT_TYPE_MSIE_HTML))
{
* Function : pcrs_filter_response
*
* Description : Apply all the pcrs jobs from the joblist (re_filterfile)
- * to the text buffer that's been accumulated in
+ * to the text buffer that's been accumulated in
* csp->iob->buf and set csp->content_length to the modified
- * size.
+ * size and raise the CSP_FLAG_MODIFIED flag if appropriate.
*
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
* Returns : a pointer to the (newly allocated) modified buffer.
* or NULL in case something went wrong
- *
+ *
*********************************************************************/
char *pcrs_filter_response(struct client_state *csp)
{
int hits=0;
- int size = csp->iob->eod - csp->iob->cur;
+ size_t size;
char *old = csp->iob->cur, *new = NULL;
pcrs_job *job;
struct file_list *fl;
struct re_filterfile_spec *b;
- /* Sanity first ;-) */
- if (size <= 0)
+ /* Sanity first */
+ if (csp->iob->cur >= csp->iob->eod)
{
return(NULL);
}
+ size = csp->iob->eod - csp->iob->cur;
+
+ /*
+ * If the body has a "chunked" transfer-encoding,
+ * get rid of it first, adjusting size and iob->eod
+ */
+ if (csp->flags & CSP_FLAG_CHUNKED)
+ {
+ log_error(LOG_LEVEL_RE_FILTER, "Need to de-chunk first");
+ if (0 == (size = remove_chunked_transfer_coding(csp->iob->cur, size)))
+ {
+ return(NULL);
+ }
+ csp->iob->eod = csp->iob->cur + size;
+ csp->flags |= CSP_FLAG_MODIFIED;
+ }
if ( ( NULL == (fl = csp->rlist) ) || ( NULL == (b = fl->f) ) )
{
log_error(LOG_LEVEL_RE_FILTER, " produced %d hits (new size %d).", hits, size);
- csp->content_length = size;
+ /*
+ * If there were no hits, destroy our copy and let
+ * chat() use the original in csp->iob
+ */
+ if (!hits)
+ {
+ free(new);
+ return(NULL);
+ }
- /* fwiw, reset the iob */
+ csp->flags |= CSP_FLAG_MODIFIED;
+ csp->content_length = size;
IOB_RESET(csp);
+
return(new);
}
*
* Function : gif_deanimate_response
*
- * Description : Deanimate the GIF image that has been accumulated in
- * csp->iob->buf and set csp->content_length to the modified
- * size.
+ * Description : Deanimate the GIF image that has been accumulated in
+ * csp->iob->buf, set csp->content_length to the modified
+ * size and raise the CSP_FLAG_MODIFIED flag.
*
* Parameters :
* 1 : csp = Current client state (buffers, headers, etc...)
*
* Returns : a pointer to the (newly allocated) modified buffer.
* or NULL in case something went wrong.
- *
+ *
*********************************************************************/
char *gif_deanimate_response(struct client_state *csp)
{
char *p;
int size = csp->iob->eod - csp->iob->cur;
+ /*
+ * If the body has a "chunked" transfer-encoding,
+ * get rid of it first, adjusting size and iob->eod
+ */
+ if (csp->flags & CSP_FLAG_CHUNKED)
+ {
+ log_error(LOG_LEVEL_DEANIMATE, "Need to de-chunk first");
+ if (0 == (size = remove_chunked_transfer_coding(csp->iob->cur, size)))
+ {
+ return(NULL);
+ }
+ csp->iob->eod = csp->iob->cur + size;
+ csp->flags |= CSP_FLAG_MODIFIED;
+ }
+
if ( (NULL == (in = (struct binbuffer *)zalloc(sizeof *in )))
|| (NULL == (out = (struct binbuffer *)zalloc(sizeof *out))) )
{
{
log_error(LOG_LEVEL_DEANIMATE, "Success! GIF shrunk from %d bytes to %d.", size, out->offset);
csp->content_length = out->offset;
+ csp->flags |= CSP_FLAG_MODIFIED;
p = out->buffer;
free(in);
free(out);
return(p);
- }
+ }
+
+}
+
+
+/*********************************************************************
+ *
+ * Function : remove_chunked_transfer_coding
+ *
+ * Description : In-situ remove the "chunked" transfer coding as defined
+ * in rfc2616 from a buffer.
+ *
+ * Parameters :
+ * 1 : buffer = Pointer to the text buffer
+ * 2 : size = Number of bytes to be processed
+ *
+ * Returns : The new size, i.e. the number of bytes from buffer which
+ * are occupied by the stripped body, or 0 in case something
+ * went wrong
+ *
+ *********************************************************************/
+int remove_chunked_transfer_coding(char *buffer, const size_t size)
+{
+ size_t newsize = 0;
+ unsigned int chunksize = 0;
+ char *from_p, *to_p;
+
+ assert(buffer);
+ from_p = to_p = buffer;
+
+ if (sscanf(buffer, "%x", &chunksize) != 1)
+ {
+ log_error(LOG_LEVEL_ERROR, "Invalid first chunksize while stripping \"chunked\" transfer coding");
+ return(0);
+ }
+
+ while (chunksize > 0)
+ {
+ if (NULL == (from_p = strstr(from_p, "\r\n")))
+ {
+ log_error(LOG_LEVEL_ERROR, "Parse error while stripping \"chunked\" transfer coding");
+ return(0);
+ }
+ newsize += chunksize;
+ from_p += 2;
+
+ memmove(to_p, from_p, (size_t) chunksize);
+ to_p = buffer + newsize;
+ from_p += chunksize + 2;
+
+ if (sscanf(from_p, "%x", &chunksize) != 1)
+ {
+ log_error(LOG_LEVEL_ERROR, "Parse error while stripping \"chunked\" transfer coding");
+ return(0);
+ }
+ }
+
+ /* FIXME: Should this get its own loglevel? */
+ log_error(LOG_LEVEL_RE_FILTER, "De-chunking successful. Shrunk from %d to %d\n", size, newsize);
+ return(newsize);
}
* Returns : N/A
*
*********************************************************************/
-void url_actions(struct http_request *http,
+void url_actions(struct http_request *http,
struct client_state *csp)
{
struct file_list *fl;
* Returns : N/A
*
*********************************************************************/
-void apply_url_actions(struct current_action_spec *action,
- struct http_request *http,
+void apply_url_actions(struct current_action_spec *action,
+ struct http_request *http,
struct url_actions *b)
{
struct url_spec url[1];
* 1 : domain = a URL address
*
* Returns : url_spec structure populated with dbuf, dcnt and dvec.
+ * On error, the dbuf field will be set to NULL. (As
+ * will all the others, but you don't need to check
+ * them).
+ *
+ * FIXME: Returning a structure is horribly inefficient, please can
+ * this structure take a (struct url_spec * dest)
+ * pointer instead?
*
*********************************************************************/
struct url_spec dsplit(char *domain)
}
ret->dbuf = strdup(domain);
+ if (NULL == ret->dbuf)
+ {
+ return *ret;
+ }
/* map to lower case */
- for (p = ret->dbuf; *p ; p++) *p = tolower(*p);
+ for (p = ret->dbuf; *p ; p++)
+ {
+ *p = tolower((int)(unsigned char)*p);
+ }
/* split the domain name into components */
ret->dcnt = ssplit(ret->dbuf, ".", v, SZ(v), 1, 1);
- if (ret->dcnt <= 0)
+ if (ret->dcnt < 0)
{
+ free(ret->dbuf);
memset(ret, '\0', sizeof(ret));
- return(*ret);
+ return *ret;
+ }
+ else if (ret->dcnt == 0)
+ {
+ return *ret;
}
/* save a copy of the pointers in dvec */
size = ret->dcnt * sizeof(*ret->dvec);
- if ((ret->dvec = (char **)malloc(size)))
+ ret->dvec = (char **)malloc(size);
+ if (NULL == ret->dvec)
{
- memcpy(ret->dvec, v, size);
+ free(ret->dbuf);
+ memset(ret, '\0', sizeof(ret));
+ return *ret;
}
- return(*ret);
+ memcpy(ret->dvec, v, size);
+
+ return *ret;
}
*
* Function : simple_domaincmp
*
- * Description : Domain-wise Compare fqdn's. The comparison is
+ * Description : Domain-wise Compare fqdn's. The comparison is
* both left- and right-anchored. The individual
* domain names are compared with simplematch().
* This is only used by domaincmp.
projects / privoxy.git / blobdiff