X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=pcrs.c;h=ee51d0a39f1a5cdd4a4d37c03d8f948cc001c93e;hp=dd1674f3b4424c07144c86dce9eb4dd6aaff6a06;hb=d8c3628ce4a3e4fee2d5dd023c2b4e5188c5ad16;hpb=72081f829de368392d04076728f8c991178c0080 diff --git a/pcrs.c b/pcrs.c index dd1674f3..ee51d0a3 100644 --- a/pcrs.c +++ b/pcrs.c @@ -1,8 +1,8 @@ -const char pcrs_rcs[] = "$Id: pcrs.c,v 1.19.2.4 2005/05/07 21:50:55 david__schmidt Exp $"; +const char pcrs_rcs[] = "$Id: pcrs.c,v 1.23 2006/12/29 17:53:05 fabiankeil Exp $"; /********************************************************************* * - * File : $Source: /cvsroot/ijbswa/current/Attic/pcrs.c,v $ + * File : $Source: /cvsroot/ijbswa/current/pcrs.c,v $ * * Purpose : pcrs is a supplement to the pcre library by Philip Hazel * and adds Perl-style substitution. That @@ -33,6 +33,19 @@ const char pcrs_rcs[] = "$Id: pcrs.c,v 1.19.2.4 2005/05/07 21:50:55 david__schmi * * Revisions : * $Log: pcrs.c,v $ + * Revision 1.23 2006/12/29 17:53:05 fabiankeil + * Fixed gcc43 conversion warnings. + * + * Revision 1.22 2006/12/24 17:34:20 fabiankeil + * Add pcrs_strerror() message for PCRE_ERROR_MATCHLIMIT + * and give a hint why an error code might be unknown. + * + * Catch NULL subjects early in pcrs_execute(). + * + * 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) * @@ -196,6 +209,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"; @@ -203,8 +223,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 */ @@ -329,7 +354,7 @@ static pcrs_substitute *pcrs_compile_replacement(const char *replacement, int tr if (trivialflag) { text = strncpy(text, replacement, length + 1); - k = length; + k = (int)length; } /* @@ -390,7 +415,7 @@ static pcrs_substitute *pcrs_compile_replacement(const char *replacement, int tr if (replacement[i] == '$' && !quoted && i < (int)(length - 1)) { char *symbol, symbols[] = "'`+&"; - r->block_length[l] = k - r->block_offset[l]; + r->block_length[l] = (size_t)(k - r->block_offset[l]); /* Numerical backreferences */ if (isdigit((int)replacement[i + 1])) @@ -455,7 +480,8 @@ plainchar: */ r->text = text; r->backrefs = l; - r->block_length[l] = k - r->block_offset[l]; + r->length = (size_t)k; + r->block_length[l] = (size_t)(k - r->block_offset[l]); return r; @@ -740,8 +766,8 @@ pcrs_job *pcrs_compile(const char *pattern, const char *substitute, const char * * * 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) @@ -800,8 +826,8 @@ int pcrs_execute_list(pcrs_job *joblist, char *subject, size_t subject_length, c * * 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) @@ -821,18 +847,18 @@ 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); } - if (NULL == (matches = (pcrs_match *)malloc(max_matches * sizeof(pcrs_match)))) + if (NULL == (matches = (pcrs_match *)malloc((size_t)max_matches * sizeof(pcrs_match)))) { *result = NULL; return(PCRS_ERR_NOMEM); } - memset(matches, '\0', max_matches * sizeof(pcrs_match)); + memset(matches, '\0', (size_t)max_matches * sizeof(pcrs_match)); /* @@ -851,29 +877,29 @@ int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **res matches[i].submatch_offset[k] = offsets[2 * k]; /* Note: Non-found optional submatches have length -1-(-1)==0 */ - matches[i].submatch_length[k] = offsets[2 * k + 1] - offsets[2 * k]; + matches[i].submatch_length[k] = (size_t)(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] * (size_t)job->substitute->backref_count[k]; } /* plus replacement text size minus match text size */ - newsize += strlen(job->substitute->text) - matches[i].submatch_length[0]; + newsize += job->substitute->length - 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]; + matches[i].submatch_length[PCRS_MAX_SUBMATCHES] = (size_t)offsets[0]; + 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_length[PCRS_MAX_SUBMATCHES + 1] = subject_length - offsets[1] - 1; - newsize += (subject_length - offsets[1]) * 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]; /* Storage for matches exhausted? -> Extend! */ if (++i >= max_matches) { max_matches = (int)(max_matches * PCRS_MAX_MATCH_GROW); - if (NULL == (dummy = (pcrs_match *)realloc(matches, max_matches * sizeof(pcrs_match)))) + if (NULL == (dummy = (pcrs_match *)realloc(matches, (size_t)max_matches * sizeof(pcrs_match)))) { free(matches); *result = NULL; @@ -928,7 +954,7 @@ int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **res 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.. */ @@ -956,11 +982,11 @@ int pcrs_execute(pcrs_job *job, char *subject, size_t subject_length, char **res result_offset += matches[i].submatch_length[job->substitute->backref[k]]; } } - offset = matches[i].submatch_offset[0] + matches[i].submatch_length[0]; + offset = matches[i].submatch_offset[0] + (int)matches[i].submatch_length[0]; } /* Copy the rest. */ - memcpy(result_offset, subject + offset, subject_length - offset); + memcpy(result_offset, subject + offset, subject_length - (size_t)offset); *result_length = newsize; free(matches);