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

Fixed a call to free with a pointer to a stack allocated struct.

Browse Source
This commit is contained in:
Markus Makela
2014-12-31 16:26:42 +02:00
parent 316093f912
commit 6710d5d25e
1 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/modules/filter/tee.c
View File

@ -150,7 +150,7 @@ typedef struct {
typedef struct {
DOWNSTREAM down; /* The downstream filter */
UPSTREAM up; /* The upstream filter */
UPSTREAM* dummy_upstream;
FILTER_DEF* dummy_filterdef;
int active; /* filter is active? */
int waiting; /* if the client is waiting for a reply */
@ -427,33 +427,22 @@ char *remote, *userName;
goto retblock;
}
ss_dassert(ses->ses_is_child);
FILTER_DEF* dummy = filter_alloc("tee_dummy","tee_dummy");
FILTER_DEF* dummy;
UPSTREAM* dummy_upstream;
dummy = filter_alloc("tee_dummy","tee_dummy");
dummy->obj = GetModuleObject();
dummy->filter = my_instance;
/*
if(my_instance->service->n_filters == 0)
{
ses->n_filters = 1;
ses->filters = calloc(2,sizeof(SESSION_FILTER));
ses->filters[0] = NULL;
ses->head = filterApply(dummy, ses,
&ses->head);
}
*/
ses->tail = *filterUpstream (dummy,my_session,&ses->tail);
dummy_upstream = filterUpstream (dummy,my_session,&ses->tail);
ses->tail = *dummy_upstream;
free(dummy_upstream);
my_session->min_replies = 2;
ss_dassert(ses->ses_is_child);
my_session->branch_session = ses;
my_session->branch_dcb = dcb;
my_session->dummy_upstream = &ses->tail;
my_session->dummy_filterdef = dummy;
}
}
@ -538,7 +527,7 @@ SESSION* ses = my_session->branch_session;
my_session->branch_session = NULL;
}
}
free(my_session->dummy_upstream);
filter_free(my_session->dummy_filterdef);
free(session);
return;