mirror of
https://bitbucket.org/jsuto/piler.git
synced 2024-12-24 18:40:13 +01:00
use proper boundary checking for to_domain string
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
parent
bb6e0578b7
commit
f72a87ca60
@ -207,6 +207,7 @@ struct parser_state {
|
||||
|
||||
int bodylen;
|
||||
int tolen;
|
||||
int todomainlen;
|
||||
int journaltolen;
|
||||
|
||||
int retention;
|
||||
|
10
src/parser.c
10
src/parser.c
@ -144,7 +144,7 @@ int parse_line(char *buf, struct parser_state *state, struct session_data *sdata
|
||||
unsigned char b64buffer[MAXBUFSIZE];
|
||||
char tmpbuf[MAXBUFSIZE];
|
||||
int n64, writelen, boundary_line=0, result;
|
||||
unsigned int len;
|
||||
unsigned int len, domainlen;
|
||||
|
||||
if(cfg->debug == 1) printf("line: %s", buf);
|
||||
|
||||
@ -170,6 +170,7 @@ int parse_line(char *buf, struct parser_state *state, struct session_data *sdata
|
||||
memset(state->b_to, 0, MAXBUFSIZE);
|
||||
state->tolen = 0;
|
||||
memset(state->b_to_domain, 0, SMALLBUFSIZE);
|
||||
state->todomainlen = 0;
|
||||
|
||||
clearhash(state->rcpt);
|
||||
clearhash(state->rcpt_domain);
|
||||
@ -721,7 +722,12 @@ int parse_line(char *buf, struct parser_state *state, struct session_data *sdata
|
||||
if(q){
|
||||
if(findnode(state->rcpt_domain, q+1) == NULL){
|
||||
addnode(state->rcpt_domain, q+1);
|
||||
memcpy(&(state->b_to_domain[strlen(state->b_to_domain)]), q+1, strlen(q+1));
|
||||
domainlen = strlen(q+1);
|
||||
|
||||
if(state->todomainlen < SMALLBUFSIZE-domainlen-1){
|
||||
memcpy(&(state->b_to_domain[state->todomainlen]), q+1, domainlen);
|
||||
state->todomainlen += domainlen;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -96,6 +96,7 @@ void init_state(struct parser_state *state){
|
||||
memset(state->b_journal_to, 0, MAXBUFSIZE);
|
||||
|
||||
state->tolen = 0;
|
||||
state->todomainlen = 0;
|
||||
state->bodylen = 0;
|
||||
state->journaltolen = 0;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user