X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=pcrs.c;h=dd1674f3b4424c07144c86dce9eb4dd6aaff6a06;hp=93c2e26de8370ae25b6c7b95528abe8c54f7e46d;hb=745615ada539f3171f2951440b01a10af61b83b2;hpb=7cc6d7ec42703a7fa6501b53447acf9fbef48db9 diff --git a/pcrs.c b/pcrs.c index 93c2e26d..dd1674f3 100644 --- a/pcrs.c +++ b/pcrs.c @@ -1,8 +1,8 @@ -const char pcrs_rcs[] = "$Id: pcrs.c,v 1.17 2002/03/08 13:45:48 oes Exp $"; +const char pcrs_rcs[] = "$Id: pcrs.c,v 1.19.2.4 2005/05/07 21:50:55 david__schmidt Exp $"; /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/pcrs.c,v $ + * File : $Source: /cvsroot/ijbswa/current/Attic/pcrs.c,v $ * * Purpose : pcrs is a supplement to the pcre library by Philip Hazel * and adds Perl-style substitution. That @@ -33,6 +33,27 @@ const char pcrs_rcs[] = "$Id: pcrs.c,v 1.17 2002/03/08 13:45:48 oes Exp $"; * * Revisions : * $Log: pcrs.c,v $ + * Revision 1.19.2.4 2005/05/07 21:50:55 david__schmidt + * A few memory leaks plugged (mostly on error paths) + * + * Revision 1.19.2.3 2003/12/04 12:32:45 oes + * Append a trailing nullbyte to result to facilitate string processing + * + * Revision 1.19.2.2 2002/10/08 16:22:28 oes + * Bugfix: Need to check validity of backreferences explicitly, + * because when max_matches are reached and matches is expanded, + * realloc() does not zero the memory. Fixes Bug # 606227 + * + * Revision 1.19.2.1 2002/08/10 11:23:40 oes + * Include prce.h via project.h, where the appropriate + * source will have been selected + * + * Revision 1.19 2002/03/08 14:47:48 oes + * Cosmetics + * + * Revision 1.18 2002/03/08 14:17:14 oes + * Fixing -Wconversion warnings + * * Revision 1.17 2002/03/08 13:45:48 oes * Hiding internal functions * @@ -123,7 +144,12 @@ const char pcrs_rcs[] = "$Id: pcrs.c,v 1.17 2002/03/08 13:45:48 oes Exp $"; *********************************************************************/ -#include +/* + * Include project.h just so that the right pcre.h gets + * included from there + */ +#include "project.h" + #include #include @@ -214,7 +240,7 @@ static int pcrs_parse_perl_options(const char *optstring, int *flags) if (NULL == optstring) return 0; - for (i=0; i < strlen(optstring); i++) + for (i = 0; i < strlen(optstring); i++) { switch(optstring[i]) { @@ -311,7 +337,7 @@ static pcrs_substitute *pcrs_compile_replacement(const char *replacement, int tr */ else { - while(i < length) + while (i < (int)length) { /* Quoting */ if (replacement[i] == '\\') @@ -325,7 +351,7 @@ static pcrs_substitute *pcrs_compile_replacement(const char *replacement, int tr { if (replacement[i+1] && strchr("tnrfae0", replacement[i+1])) { - switch(replacement[++i]) + switch (replacement[++i]) { case 't': text[k++] = '\t'; @@ -361,15 +387,15 @@ static pcrs_substitute *pcrs_compile_replacement(const char *replacement, int tr } /* Backreferences */ - if (replacement[i] == '$' && !quoted && i < length - 1) + if (replacement[i] == '$' && !quoted && i < (int)(length - 1)) { char *symbol, symbols[] = "'`+&"; r->block_length[l] = k - r->block_offset[l]; /* Numerical backreferences */ - if (isdigit((int) replacement[i + 1])) + if (isdigit((int)replacement[i + 1])) { - while (i < length && isdigit((int) replacement[++i])) + while (i < (int)length && isdigit((int)replacement[++i])) { r->backref[l] = r->backref[l] * 10 + replacement[i] - 48; } @@ -543,7 +569,7 @@ pcrs_job *pcrs_compile_command(const char *command, int *errptr) tokens[l] = (char *) malloc(limit + 1); - for (i=0; i <= limit; i++) + for (i = 0; i <= (int)limit; i++) { if (command[i] == delimiter && !quoted) @@ -698,13 +724,17 @@ pcrs_job *pcrs_compile(const char *pattern, const char *substitute, const char * * 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. + * the result when it's no longer needed. + * + * Note: For convenient string handling, a null byte is + * appended to the result. It does not count towards the + * result_length, though. + * * * 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 * @@ -717,7 +747,7 @@ pcrs_job *pcrs_compile(const char *pattern, const char *substitute, const char * 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; + char *old, *new = NULL; int hits, total_hits; old = subject; @@ -757,11 +787,14 @@ int pcrs_execute_list(pcrs_job *joblist, char *subject, size_t subject_length, c * is malloc()ed and it is the caller's responsibility to free * the result when it's no longer needed. * + * Note: For convenient string handling, a null byte is + * appended to the result. It does not count towards the + * result_length, though. + * * Parameters : * 1 : job = the pcrs_job to be executed * 2 : subject = the subject (== original) 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 * @@ -808,12 +841,12 @@ int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **res */ newsize = subject_length; - 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) { job->flags |= PCRS_SUCCESS; matches[i].submatches = submatches; - for (k=0; k < submatches; k++) + for (k = 0; k < submatches; k++) { matches[i].submatch_offset[k] = offsets[2 * k]; @@ -821,7 +854,7 @@ int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **res matches[i].submatch_length[k] = offsets[2 * k + 1] - offsets[2 * k]; /* reserve mem for each submatch as often as it is ref'd */ - newsize += matches[i].submatch_length[k] * job->substitute->backref_count[k]; + newsize += matches[i].submatch_length[k] * job->substitute->backref_count[k]; } /* plus replacement text size minus match text size */ newsize += strlen(job->substitute->text) - matches[i].submatch_length[0]; @@ -839,7 +872,7 @@ int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **res /* Storage for matches exhausted? -> Extend! */ if (++i >= max_matches) { - max_matches = (int) (max_matches * PCRS_MAX_MATCH_GROW); + max_matches = (int)(max_matches * PCRS_MAX_MATCH_GROW); if (NULL == (dummy = (pcrs_match *)realloc(matches, max_matches * sizeof(pcrs_match)))) { free(matches); @@ -854,9 +887,6 @@ int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **res /* Don't loop on empty matches */ if (offsets[1] == offset) - /* FIXME: is offset an int or a size_t? Previous line compares - * against int, the next one compares against size_t. - */ if ((size_t)offset < subject_length) offset++; else @@ -875,13 +905,18 @@ int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **res /* - * Get memory for the result + * Get memory for the result (must be freed by caller!) + * and append terminating null byte. */ - if ((*result = (char *)malloc(newsize)) == NULL) /* must be free()d by caller */ + if ((*result = (char *)malloc(newsize + 1)) == NULL) { free(matches); return PCRS_ERR_NOMEM; } + else + { + (*result)[newsize] = '\0'; + } /* @@ -890,14 +925,14 @@ int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **res offset = 0; result_offset = *result; - for (i=0; i < matches_found; i++) + for (i = 0; i < matches_found; i++) { /* copy the chunk preceding the match */ - memcpy(result_offset, subject + offset, (size_t) matches[i].submatch_offset[0] - offset); + memcpy(result_offset, subject + offset, (size_t)matches[i].submatch_offset[0] - offset); result_offset += matches[i].submatch_offset[0] - offset; /* For every segment of the substitute.. */ - for (k=0; k <= job->substitute->backrefs; k++) + for (k = 0; k <= job->substitute->backrefs; k++) { /* ...copy its text.. */ memcpy(result_offset, job->substitute->text + job->substitute->block_offset[k], job->substitute->block_length[k]); @@ -907,7 +942,9 @@ int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **res if (k != job->substitute->backrefs /* ..in legal range.. */ && job->substitute->backref[k] < PCRS_MAX_SUBMATCHES + 2 - /* ..and referencing a nonempty match.. */ + /* ..and referencing a real submatch.. */ + && job->substitute->backref[k] < matches[i].submatches + /* ..that is nonempty.. */ && matches[i].submatch_length[job->substitute->backref[k]] > 0) { /* ..copy the submatch that is ref'd. */