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

Fixed memory leak in query_classifier.

Browse Source
This commit is contained in:
Markus Makela
2015-05-03 09:58:17 +03:00
parent b53decb72b
commit c8e5df94be
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
query_classifier/query_classifier.cc
View File

@ -1204,15 +1204,15 @@ inline void add_str(char** buf, int* buflen, int* bufsize, char* str)
int isize = strlen(str) + 1; int isize = strlen(str) + 1;
if(*buf == NULL || isize + *buflen >= *bufsize) if(*buf == NULL || isize + *buflen >= *bufsize)
{ {
char *tmp = (char*)calloc((*bufsize) * 2 + isize, sizeof(char)); *bufsize = (*bufsize) * 2 + isize;
if(tmp){ char *tmp = (char*)realloc(*buf,(*bufsize)* sizeof(char));
memcpy(tmp,*buf,*bufsize); if(tmp == NULL){
if(*buf){ skygw_log_write_flush (LE,"Error: memory reallocation failed");
free(*buf); free(*buf);
*buf = NULL;
*bufsize = 0;
} }
*buf = tmp; *buf = tmp;
*bufsize = (*bufsize) * 2 + isize;
}
} }
if(*buflen > 0){ if(*buflen > 0){
@ -1248,7 +1248,12 @@ char* skygw_get_affected_fields(GWBUF* buf)
} }
lex->current_select = lex->all_selects_list; lex->current_select = lex->all_selects_list;
if((where = (char*)malloc(sizeof(char)*1)) == NULL)
{
skygw_log_write_flush(LE,"Error: Memory allocation failed.");
return NULL;
}
*where = '\0';
while(lex->current_select) while(lex->current_select)
{ {