-const char pcrs_rcs[] = "$Id: pcrs.c,v 1.8 2001/06/29 21:45:41 oes Exp $";
+const char pcrs_rcs[] = "$Id: pcrs.c,v 1.13 2001/09/06 14:05:59 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/pcrs.c,v $
*
- * Purpose : pcrs is a supplement to the brilliant pcre library by Philip
- * Hazel (ph10@cam.ac.uk) and adds Perl-style substitution. That
- * is, it mimics Perl's 's' operator.
+ * Purpose : pcrs is a supplement to the pcre library by Philip Hazel
+ * <ph10@cam.ac.uk> and adds Perl-style substitution. That
+ * is, it mimics Perl's 's' operator. See pcrs(3) for details.
*
- * Currently, there's no documentation besides comments and the
- * source itself ;-)
- *
- * Note: In addition to perl's options, 'U' for ungreedy and 'T'
- * for trivial (i.e.: ignore backrefs in the substitute) are
- * supported.
*
* Copyright : Written and Copyright (C) 2000, 2001 by Andreas S. Oesterhelt
* <andreas@oesterhelt.org>
*
* 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
- * your option) any later version.
+ * and/or modify it under the terms of the GNU Lesser
+ * General Public License (LGPL), version 2.1, which should
+ * be included in this distribution (see LICENSE.txt), with
+ * the exception that the permission to replace that license
+ * with the GNU General Public License (GPL) given in section
+ * 3 is restricted to version 2 of the GPL.
*
* This program is distributed in the hope that it will
* be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU General Public
- * License for more details.
+ * PARTICULAR PURPOSE. See the license for more details.
*
- * The GNU General Public License should be included with
- * this file. If not, you can view it at
- * http://www.gnu.org/copyleft/gpl.html
+ * The GNU Lesser General Public License should be included
+ * with this file. If not, you can view it at
+ * http://www.gnu.org/licenses/lgpl.html
* or write to the Free Software Foundation, Inc., 59
* Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* Revisions :
* $Log: pcrs.c,v $
+ * Revision 1.13 2001/09/06 14:05:59 oes
+ * Fixed silly bug
+ *
+ * Revision 1.12 2001/08/18 11:35:00 oes
+ * - Introduced pcrs_strerror()
+ * - made some NULL arguments non-fatal
+ * - added support for \n \r \e \b \t \f \a \0 in substitute
+ * - made quoting adhere to standard rules
+ * - added warning for bad backrefs
+ * - added pcrs_execute_list()
+ * - fixed comments
+ * - bugfix & cosmetics
+ *
+ * Revision 1.11 2001/08/15 15:32:03 oes
+ * - Added support for Perl's special variables $+, $' and $`
+ * - Improved the substitute parser
+ * - Replaced the hard limit for the maximum number of matches
+ * by dynamic reallocation
+ *
+ * Revision 1.10 2001/08/05 13:13:11 jongfoster
+ * Making parameters "const" where possible.
+ *
+ * Revision 1.9 2001/07/18 17:27:00 oes
+ * Changed interface; Cosmetics
+ *
* Revision 1.8 2001/06/29 21:45:41 oes
* Indentation, CRLF->LF, Tab-> Space
*
* - Removed create_pcrs_job() which was useless
* - Fixed a bug in pcrs_execute
* - Success flag is now handled by pcrs instead of user
- * - Removed logentry from cancelled commit
*
* Revision 1.6 2001/06/03 19:12:45 oes
* added FIXME
*
* Revision 1.5 2001/05/29 09:50:24 jongfoster
- * Unified blocklist/imagelist/permissionslist.
- * File format is still under discussion, but the internal changes
- * are (mostly) done.
- *
- * Also modified interceptor behaviour:
- * - We now intercept all URLs beginning with one of the following
- * prefixes (and *only* these prefixes):
- * * http://i.j.b/
- * * http://ijbswa.sf.net/config/
- * * http://ijbswa.sourceforge.net/config/
- * - New interceptors "home page" - go to http://i.j.b/ to see it.
- * - Internal changes so that intercepted and fast redirect pages
- * are not replaced with an image.
- * - Interceptors now have the option to send a binary page direct
- * to the client. (i.e. ijb-send-banner uses this)
- * - Implemented show-url-info interceptor. (Which is why I needed
- * the above interceptors changes - a typical URL is
- * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif".
- * The previous mechanism would not have intercepted that, and
- * if it had been intercepted then it then it would have replaced
- * it with an image.)
+ * (Fixed one int -> size_t)
*
* Revision 1.4 2001/05/25 14:12:40 oes
* Fixed bug: Empty substitutes now detected
*
* Revision 1.2 2001/05/22 18:46:04 oes
*
- * - Enabled filtering banners by size rather than URL
- * by adding patterns that replace all standard banner
- * sizes with the "Junkbuster" gif to the re_filterfile
- *
- * - Enabled filtering WebBugs by providing a pattern
- * which kills all 1x1 images
- *
- * - Added support for PCRE_UNGREEDY behaviour to pcrs,
+ * Added support for PCRE_UNGREEDY behaviour to pcrs,
* which is selected by the (nonstandard and therefore
* capital) letter 'U' in the option string.
* It causes the quantifiers to be ungreedy by default.
* Appending a ? turns back to greedy (!).
*
- * - Added a new interceptor ijb-send-banner, which
- * sends back the "Junkbuster" gif. Without imagelist or
- * MSIE detection support, or if tinygif = 1, or the
- * URL isn't recognized as an imageurl, a lame HTML
- * explanation is sent instead.
- *
- * - Added new feature, which permits blocking remote
- * script redirects and firing back a local redirect
- * to the browser.
- * The feature is conditionally compiled, i.e. it
- * can be disabled with --disable-fast-redirects,
- * plus it must be activated by a "fast-redirects"
- * line in the config file, has its own log level
- * and of course wants to be displayed by show-proxy-args
- * Note: Boy, all the #ifdefs in 1001 locations and
- * all the fumbling with configure.in and acconfig.h
- * were *way* more work than the feature itself :-(
- *
- * - Because a generic redirect template was needed for
- * this, tinygif = 3 now uses the same.
- *
- * - Moved GIFs, and other static HTTP response templates
- * to project.h
- *
- * - Some minor fixes
- *
- * - Removed some >400 CRs again (Jon, you really worked
- * a lot! ;-)
- *
* Revision 1.1.1.1 2001/05/15 13:59:02 oes
* Initial import of version 2.9.3 source tree
*
#include <pcre.h>
#include <string.h>
+#include <ctype.h>
+
#include "pcrs.h"
+
const char pcrs_h_rcs[] = PCRS_H_VERSION;
+/*********************************************************************
+ *
+ * Function : pcrs_strerror
+ *
+ * Description : Return a string describing a given error code.
+ *
+ * Parameters :
+ * 1 : error = the error code
+ *
+ * Returns : char * to the descriptive string
+ *
+ *********************************************************************/
+const char *pcrs_strerror(const int error)
+{
+ if (error < 0)
+ {
+ switch (error)
+ {
+ /* Passed-through PCRE error: */
+ case PCRE_ERROR_NOMEMORY: return "(pcre:) No memory";
+
+ /* 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 PCRE_ERROR_UNKNOWN_NODE: return "(pcre:) Bad node in pattern";
+
+ /* 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";
+
+ /* PCRS errors: */
+ case PCRS_ERR_NOMEM: return "(pcrs:) No memory";
+ case PCRS_ERR_CMDSYNTAX: return "(pcrs:) Syntax error while parsing command";
+ case PCRS_ERR_STUDY: return "(pcrs:) PCRE error while studying the pattern";
+ case PCRS_ERR_BADJOB: return "(pcrs:) Bad job - NULL job, pattern or substitute";
+ case PCRS_WARN_BADREF: return "(pcrs:) Backreference out of range";
+
+ /* What's that? */
+ default: return "Unknown error";
+ }
+ }
+ /* error >= 0: No error */
+ return "(pcrs:) Everything's just fine. Thanks for asking.";
+
+}
+
/*********************************************************************
*
- * Function : pcrs_compile_perl_options
+ * Function : pcrs_parse_perl_options
*
* Description : This function parses a string containing the options to
* Perl's s/// operator. It returns an integer that is the
* Returns : option integer suitable for pcre
*
*********************************************************************/
-int pcrs_compile_perl_options(char *optstring, int *flags)
+int pcrs_parse_perl_options(const char *optstring, int *flags)
{
size_t i;
int rc = 0;
*flags = 0;
+
+ if (NULL == optstring) return 0;
+
for (i=0; i < strlen(optstring); i++)
{
switch(optstring[i])
{
- case 'e': break;
+ case 'e': break; /* ToDo ;-) */
case 'g': *flags |= PCRS_GLOBAL; break;
case 'i': rc |= PCRE_CASELESS; break;
case 'm': rc |= PCRE_MULTILINE; break;
case 'x': rc |= PCRE_EXTENDED; break;
case 'U': rc |= PCRE_UNGREEDY; break;
case 'T': *flags |= PCRS_TRIVIAL; break;
- default: break;
+ default: break;
}
}
return rc;
* Parameters :
* 1 : replacement = replacement part of s/// operator
* in perl syntax
- * 2 : errptr = pointer to an integer in which error
+ * 2 : trivialflag = Flag that causes backreferences to be
+ * ignored.
+ * 3 : capturecount = Number of capturing subpatterns in
+ * the pattern. Needed for $+ handling.
+ * 4 : errptr = pointer to an integer in which error
* conditions can be returned.
*
* Returns : pcrs_substitute data structure, or NULL if an
* the reason.
*
*********************************************************************/
-pcrs_substitute *pcrs_compile_replacement(char *replacement, int trivialflag, int *errptr)
+pcrs_substitute *pcrs_compile_replacement(const char *replacement, int trivialflag, int capturecount, int *errptr)
{
- int length, i, k = 0, l = 0, quoted = 0, idx;
- char *text, *num_ptr, *numbers = "0123456789";
+ int length, i, k, l, quoted;
+ char *text;
pcrs_substitute *r;
- r = (pcrs_substitute *)malloc(sizeof(pcrs_substitute));
- if (r == NULL) return NULL;
- memset(r, '\0', sizeof(pcrs_substitute));
+ i = k = l = quoted = 0;
+
+ /*
+ * Sanity check
+ */
+ if (NULL == replacement)
+ {
+ replacement = "";
+ }
- text = strdup(replacement); /* must be free()d by caller */
- if (text == NULL)
+ /*
+ * Get memory or fail
+ */
+ if (NULL == (r = (pcrs_substitute *)malloc(sizeof(pcrs_substitute))))
{
*errptr = PCRS_ERR_NOMEM;
- free(r);
return NULL;
}
+ memset(r, '\0', sizeof(pcrs_substitute));
length = strlen(replacement);
+ if (NULL == (text = (char *)malloc(length + 1)))
+ {
+ free(r);
+ *errptr = PCRS_ERR_NOMEM;
+ return NULL;
+ }
+ memset(text, '\0', length + 1);
+
+
+ /*
+ * In trivial mode, just copy the substitute text
+ */
if (trivialflag)
{
- k = length;
+ text = strncpy(text, replacement, length + 1);
+ k = length;
}
+
+ /*
+ * Else, parse, cut out and record all backreferences
+ */
else
{
- for (i=0; i < length; i++)
+ while(i < length)
{
- /* Backslash treatment */
+ /* Quoting */
if (replacement[i] == '\\')
{
if (quoted)
{
- text[k++] = replacement[i];
+ text[k++] = replacement[i++];
quoted = 0;
}
else
{
- quoted = 1;
+ if (replacement[i+1] && strchr("tnrfae0", replacement[i+1]))
+ {
+ switch(replacement[++i])
+ {
+ case 't':
+ text[k++] = '\t';
+ break;
+ case 'n':
+ text[k++] = '\n';
+ break;
+ case 'r':
+ text[k++] = '\r';
+ break;
+ case 'f':
+ text[k++] = '\f';
+ break;
+ case 'a':
+ text[k++] = '\a';
+ break;
+ case 'e':
+ text[k++] = 27;
+ break;
+ case '0':
+ text[k++] = '\0';
+ break;
+ }
+ i++;
+ }
+ else
+ {
+ quoted = 1;
+ i++;
+ }
}
continue;
}
- /* Dollar treatment */
+ /* Backreferences */
if (replacement[i] == '$' && !quoted && i < length - 1)
{
- if (strchr("0123456789&", replacement[i + 1]) == NULL)
+ char *symbol, symbols[] = "'`+&";
+ r->block_length[l] = k - r->block_offset[l];
+
+ /* Numerical backreferences */
+ if (isdigit(replacement[i + 1]))
{
- text[k++] = replacement[i];
+ while (i < length && isdigit(replacement[++i]))
+ {
+ r->backref[l] = r->backref[l] * 10 + replacement[i] - 48;
+ }
+ if (r->backref[l] > capturecount)
+ {
+ *errptr = PCRS_WARN_BADREF;
+ }
}
- else
+
+ /* Symbolic backreferences: */
+ else if (NULL != (symbol = strchr(symbols, replacement[i + 1])))
{
- r->block_length[l] = k - r->block_offset[l];
- r->backref[l] = 0;
- if (replacement[i + 1] != '&')
+
+ if (symbol - symbols == 2) /* $+ */
{
- while ((num_ptr = strchr(numbers, replacement[++i])) != NULL && i < length)
- {
- idx = num_ptr - numbers;
- r->backref[l] = r->backref[l] * 10 + idx;
- }
- i--;
+ r->backref[l] = capturecount;
}
- else
- i++;
- if (r->backref[l] < PCRS_MAX_SUBMATCHES)
- r->backref_count[r->backref[l]] += 1;
- l++;
- r->block_offset[l] = k;
+ else if (symbol - symbols == 3) /* $& */
+ {
+ r->backref[l] = 0;
+ }
+ else /* $' or $` */
+ {
+ r->backref[l] = PCRS_MAX_SUBMATCHES + 1 - (symbol - symbols);
+ }
+ i += 2;
+ }
+
+ /* Invalid backref -> plain '$' */
+ else
+ {
+ goto plainchar;
+ }
+
+ /* Valid and in range? -> record */
+ if (r->backref[l] < PCRS_MAX_SUBMATCHES + 2)
+ {
+ r->backref_count[r->backref[l]] += 1;
+ r->block_offset[++l] = k;
}
+ else
+ {
+ *errptr = PCRS_WARN_BADREF;
+ }
continue;
}
-
- /* Plain char treatment */
- text[k++] = replacement[i];
+
+plainchar:
+ /* Plain chars are copied */
+ text[k++] = replacement[i++];
quoted = 0;
}
} /* -END- if (!trivialflag) */
- text[k] = '\0';
+ /*
+ * Finish & return
+ */
r->text = text;
r->backrefs = l;
r->block_length[l] = k - r->block_offset[l];
+
return r;
}
* Function : pcrs_free_job
*
* Description : Frees the memory used by a pcrs_job struct and its
- * dependant structures. Returns a pointer to the next
- * job, if there was any, or NULL otherwise.
+ * dependant structures.
*
* Parameters :
* 1 : job = pointer to the pcrs_job structure to be freed
}
+
/*********************************************************************
*
* Function : pcrs_free_joblist
* has the reason.
*
*********************************************************************/
-pcrs_job *pcrs_compile_command(char *command, int *errptr)
+pcrs_job *pcrs_compile_command(const char *command, int *errptr)
{
int i, k, l, limit, quoted = FALSE;
char delimiter;
char *tokens[4];
pcrs_job *newjob;
-
+
i = k = l = 0;
-
+
/*
* Tokenize the perl command
*/
}
else
{
- delimiter = command[1];
+ delimiter = command[1];
}
tokens[l] = (char *) malloc(limit + 1);
for (i=0; i <= limit; i++)
{
-
+
if (command[i] == delimiter && !quoted)
{
- if (l == 3)
- {
- l = -1;
+ if (l == 3)
+ {
+ l = -1;
break;
}
- tokens[0][k++] = '\0';
+ tokens[0][k++] = '\0';
tokens[++l] = tokens[0] + k;
continue;
}
-
- else if (command[i] == '\\' && !quoted && i+1 < limit && command[i+1] == delimiter)
+
+ else if (command[i] == '\\' && !quoted)
{
quoted = TRUE;
- continue;
+ if (command[i+1] == delimiter) continue;
+ }
+ else
+ {
+ quoted = FALSE;
}
tokens[0][k++] = command[i];
- quoted = FALSE;
}
-
/*
* Syntax error ?
*/
free(tokens[0]);
return NULL;
}
-
+
newjob = pcrs_compile(tokens[1], tokens[2], tokens[3], errptr);
free(tokens[0]);
return newjob;
-
+
}
* has the reason.
*
*********************************************************************/
-pcrs_job *pcrs_compile(char *pattern, char *substitute, char *options, int *errptr)
+pcrs_job *pcrs_compile(const char *pattern, const char *substitute, const char *options, int *errptr)
{
pcrs_job *newjob;
int flags;
+ int capturecount;
const char *error;
+ *errptr = 0;
/*
* Handle NULL arguments
*/
if (pattern == NULL) pattern = "";
if (substitute == NULL) substitute = "";
- if (options == NULL) options = "";
/*
/*
* Evaluate the options
*/
- newjob->options = pcrs_compile_perl_options(options, &flags);
+ newjob->options = pcrs_parse_perl_options(options, &flags);
newjob->flags = flags;
}
+ /*
+ * Determine the number of capturing subpatterns.
+ * This is needed for handling $+ in the substitute.
+ */
+ if (0 > (*errptr = pcre_fullinfo(newjob->pattern, newjob->hints, PCRE_INFO_CAPTURECOUNT, &capturecount)))
+ {
+ pcrs_free_job(newjob);
+ return NULL;
+ }
+
+
/*
* Compile the substitute
*/
- if (NULL == (newjob->substitute = pcrs_compile_replacement(substitute, newjob->flags & PCRS_TRIVIAL, errptr)))
+ if (NULL == (newjob->substitute = pcrs_compile_replacement(substitute, newjob->flags & PCRS_TRIVIAL, capturecount, errptr)))
{
pcrs_free_job(newjob);
return NULL;
}
+/*********************************************************************
+ *
+ * Function : pcrs_execute_list
+ *
+ * Description : This is a multiple job wrapper for pcrs_execute().
+ * Apply the regular substitutions defined by the jobs in
+ * the joblist to the subject.
+ * The subject itself is left untouched, memory for the result
+ * is malloc()ed and it is the caller's responsibility to free
+ * the result when it's no longer needed.
+ *
+ * Parameters :
+ * 1 : joblist = the chained list of pcrs_jobs to be executed
+ * 2 : subject = the subject string
+ * 3 : subject_length = the subject's length
+ * INCLUDING the terminating zero, if string!
+ * 4 : result = char** for returning the result
+ * 5 : result_length = size_t* for returning the result's length
+ *
+ * Returns : On success, the number of substitutions that were made.
+ * May be > 1 if job->flags contained PCRS_GLOBAL
+ * On failiure, the (negative) pcre error code describing the
+ * failiure, which may be translated to text using pcrs_strerror().
+ *
+ *********************************************************************/
+int pcrs_execute_list(pcrs_job *joblist, char *subject, size_t subject_length, char **result, size_t *result_length)
+{
+ pcrs_job *job;
+ char *old, *new;
+ int hits, total_hits;
+
+ old = subject;
+ *result_length = subject_length;
+ hits = total_hits = 0;
+
+ for (job = joblist; job != NULL; job = job->next)
+ {
+ hits = pcrs_execute(job, old, *result_length, &new, result_length);
+
+ if (old != subject) free(old);
+
+ if (hits < 0)
+ {
+ return(hits);
+ }
+ else
+ {
+ total_hits += hits;
+ old = new;
+ }
+ }
+
+ *result = new;
+ return(total_hits);
+
+}
+
+
/*********************************************************************
*
* Function : pcrs_execute
*
- * Description : Modify the subject by executing the regular substitution
- * defined by the job. Since the result may be longer than
- * the subject, its space requirements are precalculated in
- * the matching phase and new memory is allocated accordingly.
- * It is the caller's responsibility to free the result when
- * it's no longer needed.
+ * Description : Apply the regular substitution defined by the job to the
+ * subject.
+ * The subject itself is left untouched, memory for the result
+ * is malloc()ed and it is the caller's responsibility to free
+ * the result when it's no longer needed.
*
* Parameters :
* 1 : job = the pcrs_job to be executed
* 3 : subject_length = the subject's length
* INCLUDING the terminating zero, if string!
* 4 : result = char** for returning the result
- * 5 : result_length = int* for returning the result's length
+ * 5 : result_length = size_t* for returning the result's length
*
- * Returns : the number of substitutions that were made. May be > 1
- * if job->flags contained PCRS_GLOBAL
+ * Returns : On success, the number of substitutions that were made.
+ * May be > 1 if job->flags contained PCRS_GLOBAL
+ * On failiure, the (negative) pcre error code describing the
+ * failiure, which may be translated to text using pcrs_strerror().
*
*********************************************************************/
-int pcrs_execute(pcrs_job *job, char *subject, int subject_length, char **result, int *result_length)
+int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **result, size_t *result_length)
{
int offsets[3 * PCRS_MAX_SUBMATCHES],
offset, i, k,
matches_found,
newsize,
- submatches;
- pcrs_match matches[PCRS_MAX_MATCHES];
+ submatches,
+ max_matches = PCRS_MAX_MATCH_INIT;
+ pcrs_match *matches, *dummy;
char *result_offset;
offset = i = k = 0;
/*
- * Sanity check
+ * Sanity check & memory allocation
*/
if (job == NULL || job->pattern == NULL || job->substitute == NULL)
{
return(PCRS_ERR_BADJOB);
}
-
+ if (NULL == (matches = (pcrs_match *)malloc(max_matches * sizeof(pcrs_match))))
+ {
+ *result = NULL;
+ return(PCRS_ERR_NOMEM);
+ }
+ memset(matches, '\0', max_matches * sizeof(pcrs_match));
+
+
/*
* Find the pattern and calculate the space
- * requirements for the result (newsize)
+ * requirements for the result
*/
newsize=subject_length;
{
job->flags |= PCRS_SUCCESS;
matches[i].submatches = submatches;
+
for (k=0; k < submatches; k++)
{
matches[i].submatch_offset[k] = offsets[2 * k];
/* plus replacement text size minus match text size */
newsize += strlen(job->substitute->text) - matches[i].submatch_length[0];
+ /* chunk before match */
+ matches[i].submatch_offset[PCRS_MAX_SUBMATCHES] = 0;
+ matches[i].submatch_length[PCRS_MAX_SUBMATCHES] = offsets[0];
+ newsize += offsets[0] * job->substitute->backref_count[PCRS_MAX_SUBMATCHES];
+
+ /* chunk after match */
+ matches[i].submatch_offset[PCRS_MAX_SUBMATCHES + 1] = offsets[1];
+ matches[i].submatch_length[PCRS_MAX_SUBMATCHES + 1] = subject_length - offsets[1] - 1;
+ newsize += (subject_length - offsets[1]) * job->substitute->backref_count[PCRS_MAX_SUBMATCHES + 1];
+
+ /* Storage for matches exhausted? -> Extend! */
+ if (++i >= max_matches)
+ {
+ max_matches *= PCRS_MAX_MATCH_GROW;
+ if (NULL == (dummy = (pcrs_match *)realloc(matches, max_matches * sizeof(pcrs_match))))
+ {
+ free(matches);
+ *result = NULL;
+ return(PCRS_ERR_NOMEM);
+ }
+ matches = dummy;
+ }
+
/* Non-global search or limit reached? */
- if (++i >= PCRS_MAX_MATCHES || !(job->flags & PCRS_GLOBAL) ) break;
+ if (!(job->flags & PCRS_GLOBAL)) break;
/* Don't loop on empty matches */
if (offsets[1] == offset)
else
offset = offsets[1];
}
- /* Pass pcre error through if failiure */
- if (submatches < -1) return submatches;
+ /* Pass pcre error through if (bad) failiure */
+ if (submatches < PCRE_ERROR_NOMATCH)
+ {
+ free(matches);
+ return submatches;
+ }
matches_found = i;
*/
if ((*result = (char *)malloc(newsize)) == NULL) /* must be free()d by caller */
{
+ free(matches);
return PCRS_ERR_NOMEM;
}
/* ..plus, if it's not the last chunk, i.e.: There *is* a backref.. */
if (k != job->substitute->backrefs
/* ..in legal range.. */
- && job->substitute->backref[k] <= PCRS_MAX_SUBMATCHES
+ && job->substitute->backref[k] < PCRS_MAX_SUBMATCHES + 2
/* ..and referencing a nonempty match.. */
&& matches[i].submatch_length[job->substitute->backref[k]] > 0)
{
memcpy(result_offset, subject + offset, subject_length - offset);
*result_length = newsize;
+ free(matches);
return matches_found;
}
projects / privoxy.git / blobdiff