bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 06:00:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

use proper boundary checking for to_domain string

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2018-07-12 20:16:08 +00:00
parent bb6e0578b7
commit f72a87ca60
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/defs.h
View File

@ -207,6 +207,7 @@ struct parser_state {
int bodylen; int bodylen;
int tolen; int tolen;
int todomainlen;
int journaltolen; int journaltolen;
int retention; int retention;

10
src/parser.c
View File

@ -144,7 +144,7 @@ int parse_line(char *buf, struct parser_state *state, struct session_data *sdata
unsigned char b64buffer[MAXBUFSIZE]; unsigned char b64buffer[MAXBUFSIZE];
char tmpbuf[MAXBUFSIZE]; char tmpbuf[MAXBUFSIZE];
int n64, writelen, boundary_line=0, result; int n64, writelen, boundary_line=0, result;
unsigned int len; unsigned int len, domainlen;
if(cfg->debug == 1) printf("line: %s", buf); 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); memset(state->b_to, 0, MAXBUFSIZE);
state->tolen = 0; state->tolen = 0;
memset(state->b_to_domain, 0, SMALLBUFSIZE); memset(state->b_to_domain, 0, SMALLBUFSIZE);
state->todomainlen = 0;
clearhash(state->rcpt); clearhash(state->rcpt);
clearhash(state->rcpt_domain); clearhash(state->rcpt_domain);
@ -721,7 +722,12 @@ int parse_line(char *buf, struct parser_state *state, struct session_data *sdata
if(q){ if(q){
if(findnode(state->rcpt_domain, q+1) == NULL){ if(findnode(state->rcpt_domain, q+1) == NULL){
addnode(state->rcpt_domain, q+1); 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;
}
} }
} }

1
src/parser_utils.c
View File

@ -96,6 +96,7 @@ void init_state(struct parser_state *state){
memset(state->b_journal_to, 0, MAXBUFSIZE); memset(state->b_journal_to, 0, MAXBUFSIZE);
state->tolen = 0; state->tolen = 0;
state->todomainlen = 0;
state->bodylen = 0; state->bodylen = 0;
state->journaltolen = 0; state->journaltolen = 0;