hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix use of pcre2_substitute

Browse Source 
The length parameter is not set to the required string length unless a
parameter is set. The previous length should be stored before calling
pcre2_substitute.
This commit is contained in:
Markus Mäkelä 2017-06-05 14:43:08 +03:00
parent 5964622839
commit 808f1b34e1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
utils/skygw_utils.cc
View File

@ -1181,12 +1181,13 @@ char* remove_mysql_comments(const char** src, const size_t* srcsize, char** dest
if ((output || (output = (char*) malloc(len * sizeof (char)))) &&
(mdata = pcre2_match_data_create_from_pattern(remove_comments_re, NULL)))
{
orig_len = len;
while (pcre2_substitute(remove_comments_re, (PCRE2_SPTR) * src, orig_len, 0,
PCRE2_SUBSTITUTE_GLOBAL, mdata, NULL,
replace, PCRE2_ZERO_TERMINATED,
(PCRE2_UCHAR8*) output, &len) == PCRE2_ERROR_NOMEMORY)
{
char* tmp = (char*) realloc(output, (len = (size_t) (len * BUFFER_GROWTH_RATE + 1)));
char* tmp = (char*) realloc(output, (len = (size_t) (orig_len * BUFFER_GROWTH_RATE + 1)));
if (tmp == NULL)
{
free(output);