-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.10.2.5 2003/02/28 13:09:29 oes 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 $
*
* 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
*
*/
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;
}
* 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
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;
char *v[150];
size_t size;
- /* Parse domain part */
+ /*
+ * Parse domain part
+ */
if (buf[strlen(buf) - 1] == '.')
{
url->unanchored |= ANCHOR_RIGHT;
url->unanchored |= ANCHOR_LEFT;
}
- /* split domain into components */
-
+ /*
+ * Split domain into components
+ */
url->dbuffer = strdup(buf);
if (NULL == url->dbuffer)
{
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)
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);
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;