From a52d93e6c4f3761fdf327c4678e5bae52e97f4b6 Mon Sep 17 00:00:00 2001 From: oes Date: Thu, 4 Dec 2003 12:32:45 +0000 Subject: [PATCH] Append a trailing nullbyte to result to facilitate string processing --- pcrs.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/pcrs.c b/pcrs.c index 5780188b..100ebe45 100644 --- a/pcrs.c +++ b/pcrs.c @@ -1,4 +1,4 @@ -const char pcrs_rcs[] = "$Id: pcrs.c,v 1.19.2.1 2002/08/10 11:23:40 oes Exp $"; +const char pcrs_rcs[] = "$Id: pcrs.c,v 1.19.2.2 2002/10/08 16:22:28 oes Exp $"; /********************************************************************* * @@ -33,6 +33,11 @@ const char pcrs_rcs[] = "$Id: pcrs.c,v 1.19.2.1 2002/08/10 11:23:40 oes Exp $"; * * Revisions : * $Log: pcrs.c,v $ + * 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 @@ -713,13 +718,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 * @@ -772,11 +781,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 * @@ -836,7 +848,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]; @@ -887,13 +899,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'; + } /* @@ -919,7 +936,7 @@ 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 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) -- 2.49.0