-const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.86 2015/12/27 12:47:17 fabiankeil Exp $";
+const char urlmatch_rcs[] = "$Id: urlmatch.c,v 1.88 2016/03/17 10:40:53 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/urlmatch.c,v $
struct pattern_spec *url, regex_t **regex)
{
int errcode;
- char rebuf[BUFFER_SIZE];
const char *fmt = NULL;
+ char *rebuf;
+ size_t rebuf_size;
assert(pattern);
- assert(strlen(pattern) < sizeof(rebuf) - 2);
if (pattern[0] == '\0')
{
log_error(LOG_LEVEL_FATAL,
"Invalid anchoring in compile_pattern %d", anchoring);
}
-
+ rebuf_size = strlen(pattern) + strlen(fmt);
+ rebuf = malloc_or_die(rebuf_size);
*regex = zalloc_or_die(sizeof(**regex));
- snprintf(rebuf, sizeof(rebuf), fmt, pattern);
+ snprintf(rebuf, rebuf_size, fmt, pattern);
errcode = regcomp(*regex, rebuf, (REG_EXTENDED|REG_NOSUB|REG_ICASE));
if (errcode)
{
- size_t errlen = regerror(errcode, *regex, rebuf, sizeof(rebuf));
- if (errlen > (sizeof(rebuf) - (size_t)1))
+ size_t errlen = regerror(errcode, *regex, rebuf, rebuf_size);
+ if (errlen > (rebuf_size - (size_t)1))
{
- errlen = sizeof(rebuf) - (size_t)1;
+ errlen = rebuf_size - (size_t)1;
}
rebuf[errlen] = '\0';
log_error(LOG_LEVEL_ERROR, "error compiling %s from %s: %s",
pattern, url->spec, rebuf);
free_pattern_spec(url);
+ freez(rebuf);
return JB_ERR_PARSE;
}
+ freez(rebuf);
return JB_ERR_OK;
const unsigned flag;
} tag_pattern[] = {
{ "TAG:", 4, PATTERN_SPEC_TAG_PATTERN},
+ #ifdef FEATURE_CLIENT_TAGS
+ { "CLIENT-TAG:", 11, PATTERN_SPEC_CLIENT_TAG_PATTERN},
+ #endif
{ "NO-REQUEST-TAG:", 15, PATTERN_SPEC_NO_REQUEST_TAG_PATTERN},
{ "NO-RESPONSE-TAG:", 16, PATTERN_SPEC_NO_RESPONSE_TAG_PATTERN}
};