X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=pcrs.c;h=f1d55f6157b1de6badba5b7dc037aa3bdc341930;hb=4119f0492859fae054d2bb62b933a996004b245a;hp=45a471b9b5a0cbf7711535b56c0c014e41964d47;hpb=45941ff53385068f300d4cc9046db8b52e157e22;p=privoxy.git diff --git a/pcrs.c b/pcrs.c index 45a471b9..f1d55f61 100644 --- a/pcrs.c +++ b/pcrs.c @@ -1,4 +1,4 @@ -const char pcrs_rcs[] = "$Id: pcrs.c,v 1.18 2002/03/08 14:17:14 oes Exp $"; +const char pcrs_rcs[] = "$Id: pcrs.c,v 1.21 2006/07/18 14:48:47 david__schmidt Exp $"; /********************************************************************* * @@ -33,6 +33,28 @@ const char pcrs_rcs[] = "$Id: pcrs.c,v 1.18 2002/03/08 14:17:14 oes Exp $"; * * Revisions : * $Log: pcrs.c,v $ + * Revision 1.21 2006/07/18 14:48:47 david__schmidt + * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch) + * with what was really the latest development (the v_3_0_branch branch) + * + * 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 * @@ -126,7 +148,12 @@ const char pcrs_rcs[] = "$Id: pcrs.c,v 1.18 2002/03/08 14:17:14 oes Exp $"; *********************************************************************/ -#include +/* + * Include project.h just so that the right pcre.h gets + * included from there + */ +#include "project.h" + #include #include @@ -173,6 +200,13 @@ const char *pcrs_strerror(const int error) case PCRE_ERROR_NOSUBSTRING: return "(pcre:) Fire in power supply"; case PCRE_ERROR_NOMATCH: return "(pcre:) Water in power supply"; +#ifdef PCRE_ERROR_MATCHLIMIT + /* + * Only reported by PCRE versions newer than our own. + */ + case PCRE_ERROR_MATCHLIMIT: return "(pcre:) Match limit reached"; +#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"; @@ -180,8 +214,13 @@ const char *pcrs_strerror(const int error) 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"; + /* + * 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: return "Unknown error. Privoxy out of sync with PCRE?"; } } /* error >= 0: No error */ @@ -701,26 +740,30 @@ 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 * * 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(). + * On failure, the (negative) pcre error code describing the + * failure, 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; + char *old, *new = NULL; int hits, total_hits; old = subject; @@ -760,18 +803,21 @@ 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 * * 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(). + * On failure, the (negative) pcre error code describing the + * failure, which may be translated to text using pcrs_strerror(). * *********************************************************************/ int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **result, size_t *result_length) @@ -791,7 +837,7 @@ int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **res /* * Sanity check & memory allocation */ - if (job == NULL || job->pattern == NULL || job->substitute == NULL) + if (job == NULL || job->pattern == NULL || job->substitute == NULL || NULL == subject) { *result = NULL; return(PCRS_ERR_BADJOB); @@ -824,7 +870,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]; @@ -875,13 +921,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'; + } /* @@ -907,7 +958,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. */