projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure: Fix --disable-pcre2
[privoxy.git]
/
pcrs.c
diff --git
a/pcrs.c
b/pcrs.c
index
8310098
..
eaeea62
100644
(file)
--- a/
pcrs.c
+++ b/
pcrs.c
@@
-57,7
+57,7
@@
* Internal prototypes
*/
* Internal prototypes
*/
-static int pcrs_parse_perl_options(const char *optstring, int *flags);
+static int pcrs_parse_perl_options(const char *optstring,
unsigned
int *flags);
static pcrs_substitute *pcrs_compile_replacement(const char *replacement, int trivialflag,
int capturecount, int *errptr);
static int is_hex_sequence(const char *sequence);
static pcrs_substitute *pcrs_compile_replacement(const char *replacement, int trivialflag,
int capturecount, int *errptr);
static int is_hex_sequence(const char *sequence);
@@
-83,25
+83,25
@@
const char *pcrs_strerror(const int error)
switch (error)
{
/* Passed-through PCRE error: */
switch (error)
{
/* Passed-through PCRE error: */
- case PCRE
_ERROR_NOMEMORY
: return "(pcre:) No memory";
+ case PCRE
n(ERROR_NOMEMORY)
: return "(pcre:) No memory";
/* Shouldn't happen unless PCRE or PCRS bug, or user messed with compiled job: */
/* Shouldn't happen unless PCRE or PCRS bug, or user messed with compiled job: */
- case PCRE_ERROR_NULL: return "(pcre:) NULL code or subject or ovector";
- case PCRE_ERROR_BADOPTION: return "(pcre:) Unrecognized option bit";
- case PCRE_ERROR_BADMAGIC: return "(pcre:) Bad magic number in code";
+ case PCREn(ERROR_NULL): return "(pcre:) NULL code or subject or ovector";
+ case PCREn(ERROR_BADOPTION): return "(pcre:) Unrecognized option bit";
+ case PCREn(ERROR_BADMAGIC): return "(pcre:) Bad magic number in code";
+#if defined(PCRE_ERROR_UNKNOWN_NODE)
case PCRE_ERROR_UNKNOWN_NODE: return "(pcre:) Bad node in pattern";
case PCRE_ERROR_UNKNOWN_NODE: return "(pcre:) Bad node in pattern";
-
+#endif
/* Can't happen / not passed: */
/* Can't happen / not passed: */
- case PCRE
_ERROR_NOSUBSTRING
: return "(pcre:) Fire in power supply";
- case PCRE
_ERROR_NOMATCH
: return "(pcre:) Water in power supply";
+ case PCRE
n(ERROR_NOSUBSTRING)
: return "(pcre:) Fire in power supply";
+ case PCRE
n(ERROR_NOMATCH)
: return "(pcre:) Water in power supply";
#ifdef PCRE_ERROR_MATCHLIMIT
/*
* Only reported by PCRE versions newer than our own.
*/
#ifdef PCRE_ERROR_MATCHLIMIT
/*
* Only reported by PCRE versions newer than our own.
*/
- case PCRE
_ERROR_MATCHLIMIT
: return "(pcre:) Match limit reached";
+ case PCRE
n(ERROR_MATCHLIMIT)
: return "(pcre:) Match limit reached";
#endif /* def PCRE_ERROR_MATCHLIMIT */
#endif /* def PCRE_ERROR_MATCHLIMIT */
-
/* PCRS errors: */
case PCRS_ERR_NOMEM: return "(pcrs:) No memory";
case PCRS_ERR_CMDSYNTAX: return "(pcrs:) Syntax error while parsing command";
/* PCRS errors: */
case PCRS_ERR_NOMEM: return "(pcrs:) No memory";
case PCRS_ERR_CMDSYNTAX: return "(pcrs:) Syntax error while parsing command";
@@
-111,16
+111,14
@@
const char *pcrs_strerror(const int error)
case PCRS_WARN_TRUNCATION:
return "(pcrs:) At least one variable was too big and has been truncated before compilation";
case PCRS_WARN_TRUNCATION:
return "(pcrs:) At least one variable was too big and has been truncated before compilation";
- /*
- * XXX: With the exception of PCRE_ERROR_MATCHLIMIT we
- * only catch PCRE errors that can happen with our internal
- * version. If Privoxy is linked against a newer
- * PCRE version all bets are off ...
- */
default:
default:
+#ifdef HAVE_PCRE2
+ pcre2_get_error_message(error, (PCRE2_UCHAR8*)buf, sizeof(buf));
+#else
snprintf(buf, sizeof(buf),
"Error code %d. For details, check the pcre documentation.",
error);
snprintf(buf, sizeof(buf),
"Error code %d. For details, check the pcre documentation.",
error);
+#endif
return buf;
}
}
return buf;
}
}
@@
-149,7
+147,7
@@
const char *pcrs_strerror(const int error)
* Returns : option integer suitable for pcre
*
*********************************************************************/
* Returns : option integer suitable for pcre
*
*********************************************************************/
-static int pcrs_parse_perl_options(const char *optstring, int *flags)
+static int pcrs_parse_perl_options(const char *optstring,
unsigned
int *flags)
{
size_t i;
int rc = 0;
{
size_t i;
int rc = 0;
@@
-163,13
+161,13
@@
static int pcrs_parse_perl_options(const char *optstring, int *flags)
{
case 'e': break; /* ToDo ;-) */
case 'g': *flags |= PCRS_GLOBAL; break;
{
case 'e': break; /* ToDo ;-) */
case 'g': *flags |= PCRS_GLOBAL; break;
- case 'i': rc |= PCRE
_CASELESS
; break;
- case 'm': rc |= PCRE
_MULTILINE
; break;
+ case 'i': rc |= PCRE
n(CASELESS)
; break;
+ case 'm': rc |= PCRE
n(MULTILINE)
; break;
case 'o': break;
case 'o': break;
- case 's': rc |= PCRE
_DOTALL
; break;
- case 'x': rc |= PCRE
_EXTENDED
; break;
+ case 's': rc |= PCRE
n(DOTALL)
; break;
+ case 'x': rc |= PCRE
n(EXTENDED)
; break;
case 'D': *flags |= PCRS_DYNAMIC; break;
case 'D': *flags |= PCRS_DYNAMIC; break;
- case 'U': rc |= PCRE
_UNGREEDY
; break;
+ case 'U': rc |= PCRE
n(UNGREEDY)
; break;
case 'T': *flags |= PCRS_TRIVIAL; break;
default: break;
}
case 'T': *flags |= PCRS_TRIVIAL; break;
default: break;
}
@@
-471,7
+469,15
@@
pcrs_job *pcrs_free_job(pcrs_job *job)
else
{
next = job->next;
else
{
next = job->next;
- if (job->pattern != NULL) free(job->pattern);
+ if (job->pattern != NULL)
+ {
+#ifdef HAVE_PCRE2
+ pcre2_code_free(job->pattern);
+#else
+ free(job->pattern);
+#endif
+ }
+#ifndef HAVE_PCRE2
if (job->hints != NULL)
{
#ifdef PCRE_CONFIG_JIT
if (job->hints != NULL)
{
#ifdef PCRE_CONFIG_JIT
@@
-480,6
+486,7
@@
pcrs_job *pcrs_free_job(pcrs_job *job)
free(job->hints);
#endif
}
free(job->hints);
#endif
}
+#endif
if (job->substitute != NULL)
{
if (job->substitute->text != NULL) free(job->substitute->text);
if (job->substitute != NULL)
{
if (job->substitute->text != NULL) free(job->substitute->text);
@@
-626,10
+633,14
@@
pcrs_job *pcrs_compile_command(const char *command, int *errptr)
pcrs_job *pcrs_compile(const char *pattern, const char *substitute, const char *options, int *errptr)
{
pcrs_job *newjob;
pcrs_job *pcrs_compile(const char *pattern, const char *substitute, const char *options, int *errptr)
{
pcrs_job *newjob;
- int flags;
+
unsigned
int flags;
int capturecount;
int capturecount;
- const char *error;
+#ifdef HAVE_PCRE2
+ int ret;
+#else
int pcre_study_options = 0;
int pcre_study_options = 0;
+ const char *error;
+#endif
*errptr = 0;
*errptr = 0;
@@
-661,21
+672,43
@@
pcrs_job *pcrs_compile(const char *pattern, const char *substitute, const char *
/*
* Compile the pattern
*/
/*
* Compile the pattern
*/
+#ifdef HAVE_PCRE2
+ PCRE2_SIZE error_offset;
+ newjob->pattern = pcre2_compile((const unsigned char *)pattern,
+ PCRE2_ZERO_TERMINATED, (unsigned)newjob->options, errptr,
+ &error_offset, NULL);
+#else
newjob->pattern = pcre_compile(pattern, newjob->options, &error, errptr, NULL);
newjob->pattern = pcre_compile(pattern, newjob->options, &error, errptr, NULL);
+#endif
if (newjob->pattern == NULL)
{
pcrs_free_job(newjob);
return NULL;
}
if (newjob->pattern == NULL)
{
pcrs_free_job(newjob);
return NULL;
}
-
-#ifdef PCRE_STUDY_JIT_COMPILE
+#if defined(PCRE_STUDY_JIT_COMPILE) || defined(HAVE_PCRE2)
+#ifdef DISABLE_PCRE_JIT_COMPILATION
+#warning PCRE_STUDY_JIT_COMPILE is supported but Privoxy has been configured not to use it
+#else
if (!(flags & PCRS_DYNAMIC))
{
if (!(flags & PCRS_DYNAMIC))
{
+#ifdef HAVE_PCRE2
+ /* Try to enable JIT compilation but continue if it's unsupported. */
+ if ((ret = pcre2_jit_compile(newjob->pattern, PCRE2_JIT_COMPLETE)) &&
+ (ret != PCRE2_ERROR_JIT_BADOPTION))
+ {
+ *errptr = ret;
+ pcrs_free_job(newjob);
+ return NULL;
+ }
+#else
pcre_study_options = PCRE_STUDY_JIT_COMPILE;
pcre_study_options = PCRE_STUDY_JIT_COMPILE;
+#endif
}
#endif
}
#endif
+#endif
+#ifndef HAVE_PCRE2
/*
* Generate hints. This has little overhead, since the
* hints will be NULL for a boring pattern anyway.
/*
* Generate hints. This has little overhead, since the
* hints will be NULL for a boring pattern anyway.
@@
-687,13
+720,17
@@
pcrs_job *pcrs_compile(const char *pattern, const char *substitute, const char *
pcrs_free_job(newjob);
return NULL;
}
pcrs_free_job(newjob);
return NULL;
}
-
+#endif
/*
* Determine the number of capturing subpatterns.
* This is needed for handling $+ in the substitute.
*/
/*
* Determine the number of capturing subpatterns.
* This is needed for handling $+ in the substitute.
*/
+#ifdef HAVE_PCRE2
+ if (0 > (*errptr = pcre2_pattern_info(newjob->pattern, PCRE2_INFO_CAPTURECOUNT, &capturecount)))
+#else
if (0 > (*errptr = pcre_fullinfo(newjob->pattern, newjob->hints, PCRE_INFO_CAPTURECOUNT, &capturecount)))
if (0 > (*errptr = pcre_fullinfo(newjob->pattern, newjob->hints, PCRE_INFO_CAPTURECOUNT, &capturecount)))
+#endif
{
pcrs_free_job(newjob);
return NULL;
{
pcrs_free_job(newjob);
return NULL;
@@
-805,14
+842,20
@@
int pcrs_execute_list(pcrs_job *joblist, char *subject, size_t subject_length, c
*********************************************************************/
int pcrs_execute(pcrs_job *job, const char *subject, size_t subject_length, char **result, size_t *result_length)
{
*********************************************************************/
int pcrs_execute(pcrs_job *job, const char *subject, size_t subject_length, char **result, size_t *result_length)
{
- int offsets[3 * PCRS_MAX_SUBMATCHES],
- offset,
+ int offset,
i, k,
matches_found,
submatches,
max_matches = PCRS_MAX_MATCH_INIT;
size_t newsize;
i, k,
matches_found,
submatches,
max_matches = PCRS_MAX_MATCH_INIT;
size_t newsize;
+#ifdef HAVE_PCRE2
pcrs_match *matches, *dummy;
pcrs_match *matches, *dummy;
+ pcre2_match_data *pcre2_matches;
+ size_t *offsets;
+#else
+ pcrs_match *matches, *dummy;
+ int offsets[3 * PCRS_MAX_SUBMATCHES];
+#endif
char *result_offset;
offset = i = 0;
char *result_offset;
offset = i = 0;
@@
-826,27
+869,38
@@
int pcrs_execute(pcrs_job *job, const char *subject, size_t subject_length, char
return(PCRS_ERR_BADJOB);
}
return(PCRS_ERR_BADJOB);
}
+#ifdef HAVE_PCRE2
+ if (NULL == (pcre2_matches = pcre2_match_data_create_from_pattern(job->pattern, NULL)))
+ {
+ return(PCRS_ERR_NOMEM);
+ }
+ offsets = pcre2_get_ovector_pointer(pcre2_matches);
+#endif
if (NULL == (matches = (pcrs_match *)malloc((size_t)max_matches * sizeof(pcrs_match))))
{
return(PCRS_ERR_NOMEM);
}
memset(matches, '\0', (size_t)max_matches * sizeof(pcrs_match));
if (NULL == (matches = (pcrs_match *)malloc((size_t)max_matches * sizeof(pcrs_match))))
{
return(PCRS_ERR_NOMEM);
}
memset(matches, '\0', (size_t)max_matches * sizeof(pcrs_match));
-
/*
* Find the pattern and calculate the space
* requirements for the result
*/
newsize = subject_length;
/*
* Find the pattern and calculate the space
* requirements for the result
*/
newsize = subject_length;
+#ifdef HAVE_PCRE2
+ while ((submatches = pcre2_match(job->pattern, (const unsigned char *)subject,
+ subject_length, (size_t)offset, 0, pcre2_matches, NULL)) > 0)
+#else
while ((submatches = pcre_exec(job->pattern, job->hints, subject, (int)subject_length, offset, 0, offsets, 3 * PCRS_MAX_SUBMATCHES)) > 0)
while ((submatches = pcre_exec(job->pattern, job->hints, subject, (int)subject_length, offset, 0, offsets, 3 * PCRS_MAX_SUBMATCHES)) > 0)
+#endif
{
job->flags |= PCRS_SUCCESS;
matches[i].submatches = submatches;
for (k = 0; k < submatches; k++)
{
{
job->flags |= PCRS_SUCCESS;
matches[i].submatches = submatches;
for (k = 0; k < submatches; k++)
{
- matches[i].submatch_offset[k] = offsets[2 * k];
+ matches[i].submatch_offset[k] =
(int)
offsets[2 * k];
/* Note: Non-found optional submatches have length -1-(-1)==0 */
matches[i].submatch_length[k] = (size_t)(offsets[2 * k + 1] - offsets[2 * k]);
/* Note: Non-found optional submatches have length -1-(-1)==0 */
matches[i].submatch_length[k] = (size_t)(offsets[2 * k + 1] - offsets[2 * k]);
@@
-863,7
+917,7
@@
int pcrs_execute(pcrs_job *job, const char *subject, size_t subject_length, char
newsize += (size_t)offsets[0] * (size_t)job->substitute->backref_count[PCRS_MAX_SUBMATCHES];
/* chunk after match */
newsize += (size_t)offsets[0] * (size_t)job->substitute->backref_count[PCRS_MAX_SUBMATCHES];
/* chunk after match */
- matches[i].submatch_offset[PCRS_MAX_SUBMATCHES + 1] = offsets[1];
+ matches[i].submatch_offset[PCRS_MAX_SUBMATCHES + 1] =
(int)
offsets[1];
matches[i].submatch_length[PCRS_MAX_SUBMATCHES + 1] = subject_length - (size_t)offsets[1] - 1;
newsize += (subject_length - (size_t)offsets[1]) * (size_t)job->substitute->backref_count[PCRS_MAX_SUBMATCHES + 1];
matches[i].submatch_length[PCRS_MAX_SUBMATCHES + 1] = subject_length - (size_t)offsets[1] - 1;
newsize += (subject_length - (size_t)offsets[1]) * (size_t)job->substitute->backref_count[PCRS_MAX_SUBMATCHES + 1];
@@
-890,12
+944,19
@@
int pcrs_execute(pcrs_job *job, const char *subject, size_t subject_length, char
break;
/* Go find the next one */
else
break;
/* Go find the next one */
else
- offset = offsets[1];
+ offset =
(int)
offsets[1];
}
/* Pass pcre error through if (bad) failure */
}
/* Pass pcre error through if (bad) failure */
+#ifdef HAVE_PCRE2
+ if (submatches < PCRE2_ERROR_NOMATCH)
+#else
if (submatches < PCRE_ERROR_NOMATCH)
if (submatches < PCRE_ERROR_NOMATCH)
+#endif
{
free(matches);
{
free(matches);
+#ifdef HAVE_PCRE2
+ pcre2_match_data_free(pcre2_matches);
+#endif
return submatches;
}
matches_found = i;
return submatches;
}
matches_found = i;
@@
-905,9
+966,19
@@
int pcrs_execute(pcrs_job *job, const char *subject, size_t subject_length, char
* Get memory for the result (must be freed by caller!)
* and append terminating null byte.
*/
* Get memory for the result (must be freed by caller!)
* and append terminating null byte.
*/
- if ((*result = (char *)malloc(newsize + 1)) == NULL)
+ if ((*result = (char *)malloc(newsize + 1
+#ifdef HAVE_PCRE2
+ /*
+ * Work around to prevent invalid reads in the jit code.
+ */
+ + 16
+#endif
+ )) == NULL)
{
free(matches);
{
free(matches);
+#ifdef HAVE_PCRE2
+ pcre2_match_data_free(pcre2_matches);
+#endif
return PCRS_ERR_NOMEM;
}
else
return PCRS_ERR_NOMEM;
}
else
@@
-960,6
+1031,9
@@
int pcrs_execute(pcrs_job *job, const char *subject, size_t subject_length, char
memcpy(result_offset, subject + offset, subject_length - (size_t)offset);
*result_length = newsize;
memcpy(result_offset, subject + offset, subject_length - (size_t)offset);
*result_length = newsize;
+#ifdef HAVE_PCRE2
+ pcre2_match_data_free(pcre2_matches);
+#endif
free(matches);
return matches_found;
free(matches);
return matches_found;
@@
-1097,7
+1171,7
@@
char pcrs_get_delimiter(const char *string)
*********************************************************************/
char *pcrs_execute_single_command(const char *subject, const char *pcrs_command, int *hits)
{
*********************************************************************/
char *pcrs_execute_single_command(const char *subject, const char *pcrs_command, int *hits)
{
- size_t size;
+ size_t
buffer_size, new_
size;
char *result = NULL;
pcrs_job *job;
char *result = NULL;
pcrs_job *job;
@@
-1105,12
+1179,12
@@
char *pcrs_execute_single_command(const char *subject, const char *pcrs_command,
assert(pcrs_command);
*hits = 0;
assert(pcrs_command);
*hits = 0;
- size = strlen(subject);
+
buffer_
size = strlen(subject);
job = pcrs_compile_command(pcrs_command, hits);
if (NULL != job)
{
job = pcrs_compile_command(pcrs_command, hits);
if (NULL != job)
{
- *hits = pcrs_execute(job, subject,
size, &result, &
size);
+ *hits = pcrs_execute(job, subject,
buffer_size, &result, &new_
size);
if (*hits < 0)
{
freez(result);
if (*hits < 0)
{
freez(result);