-const char pcrs_rcs[] = "$Id: pcrs.c,v 2.4 2003/01/21 02:49:27 david__schmidt 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/src/pcrs.c,v $
+ * File : $Source: /cvsroot/ijbswa/current/Attic/pcrs.c,v $
*
* Purpose : pcrs is a supplement to the pcre library by Philip Hazel
* <ph10@cam.ac.uk> and adds Perl-style substitution. That
*
* Revisions :
* $Log: pcrs.c,v $
- * Revision 2.4 2003/01/21 02:49:27 david__schmidt
- * Developer TODO 612294: src: C++ keyword as variable name
- * I changed all ocurrences of 'new' to 'new_something' wherever I found
- * one. I also brought up all the source files in MSDEV to see if I could
- * spot any highlighted keywords that really were variables. Non-scientific,
- * but at least I tried. :-)
+ * Revision 1.19.2.4 2005/05/07 21:50:55 david__schmidt
+ * A few memory leaks plugged (mostly on error paths)
*
- * Revision 2.3 2002/10/08 16:25:30 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.3 2003/12/04 12:32:45 oes
+ * Append a trailing nullbyte to result to facilitate string processing
*
- * Revision 2.2 2002/09/04 15:52:02 oes
- * Synced with the stable branch:
- * 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.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 2.1 2002/08/26 11:18:24 sarantis
- * Fix typo.
- *
- * Revision 2.0 2002/06/04 14:34:21 jongfoster
- * Moving source files to src/
+ * 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
* 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 failure, the (negative) pcre error code describing the
- * failure, which may be translated to text using pcrs_strerror().
+ * 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_item, *new_item;
+ char *old, *new = NULL;
int hits, total_hits;
- old_item = subject;
+ old = subject;
*result_length = subject_length;
hits = total_hits = 0;
for (job = joblist; job != NULL; job = job->next)
{
- hits = pcrs_execute(job, old_item, *result_length, &new_item, result_length);
+ hits = pcrs_execute(job, old, *result_length, &new, result_length);
- if (old_item != subject) free(old_item);
+ if (old != subject) free(old);
if (hits < 0)
{
else
{
total_hits += hits;
- old_item = new_item;
+ old = new;
}
}
- *result = new_item;
+ *result = new;
return(total_hits);
}
* 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 failure, the (negative) pcre error code describing the
- * failure, which may be translated to text using pcrs_strerror().
+ * 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, size_t subject_length, char **result, size_t *result_length)
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];
else
offset = offsets[1];
}
- /* Pass pcre error through if (bad) failure */
+ /* Pass pcre error through if (bad) failiure */
if (submatches < PCRE_ERROR_NOMATCH)
{
free(matches);
/*
- * 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';
+ }
/*
if (k != job->substitute->backrefs
/* ..in legal range.. */
&& job->substitute->backref[k] < PCRS_MAX_SUBMATCHES + 2
- /* ..and referencing a real submatch.. */
+ /* ..and referencing a real submatch.. */
&& job->substitute->backref[k] < matches[i].submatches
/* ..that is nonempty.. */
&& matches[i].submatch_length[job->substitute->backref[k]] > 0)
projects / privoxy.git / blobdiff