bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a SEGV problem with invalid requests.

Browse Source
This commit is contained in:
Robert James Kaes 2001-08-27 03:44:22 +00:00
parent 7be408859d
commit 771425700d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/reqs.c
View File

@ -1,4 +1,4 @@
/* $Id: reqs.c,v 1.15 2001-08-26 21:11:55 rjkaes Exp $ /* $Id: reqs.c,v 1.16 2001-08-27 03:44:22 rjkaes Exp $
* *
* This is where all the work in tinyproxy is actually done. Incoming * This is where all the work in tinyproxy is actually done. Incoming
* connections have a new thread created for them. The thread then * connections have a new thread created for them. The thread then
@ -122,14 +122,14 @@ static int process_method(struct conn_s *connptr)
log_message(LOG_ERR, "clientreq: regcomp"); log_message(LOG_ERR, "clientreq: regcomp");
httperr(connptr, 503, HTTP503ERROR); httperr(connptr, 503, HTTP503ERROR);
update_stats(STAT_BADCONN); update_stats(STAT_BADCONN);
goto COMMON_EXIT; goto EARLY_EXIT;
} }
if (regexec(&preg, inbuf, NMATCH, pmatch, 0) != 0) { if (regexec(&preg, inbuf, NMATCH, pmatch, 0) != 0) {
log_message(LOG_ERR, "clientreq: regexec"); log_message(LOG_ERR, "clientreq: regexec");
regfree(&preg); regfree(&preg);
httperr(connptr, 503, HTTP503ERROR); httperr(connptr, 503, HTTP503ERROR);
update_stats(STAT_BADCONN); update_stats(STAT_BADCONN);
goto COMMON_EXIT; goto EARLY_EXIT;
} }
regfree(&preg); regfree(&preg);
@ -147,7 +147,7 @@ static int process_method(struct conn_s *connptr)
peer_ipaddr, inbuf); peer_ipaddr, inbuf);
httperr(connptr, 400, HTTP400ERROR); httperr(connptr, 400, HTTP400ERROR);
update_stats(STAT_BADCONN); update_stats(STAT_BADCONN);
goto COMMON_EXIT; goto EARLY_EXIT;
} }
len = pmatch[URI_IND].rm_eo - pmatch[URI_IND].rm_so; len = pmatch[URI_IND].rm_eo - pmatch[URI_IND].rm_so;
@ -157,7 +157,7 @@ static int process_method(struct conn_s *connptr)
peer_ipaddr); peer_ipaddr);
httperr(connptr, 503, HTTP503ERROR); httperr(connptr, 503, HTTP503ERROR);
update_stats(STAT_BADCONN); update_stats(STAT_BADCONN);
goto COMMON_EXIT; goto EARLY_EXIT;
} }
memcpy(buffer, inbuf + pmatch[URI_IND].rm_so, len); memcpy(buffer, inbuf + pmatch[URI_IND].rm_so, len);
buffer[len] = '\0'; buffer[len] = '\0';
@ -166,7 +166,7 @@ static int process_method(struct conn_s *connptr)
log_message(LOG_ERR, "clientreq: Problem with explode_uri"); log_message(LOG_ERR, "clientreq: Problem with explode_uri");
httperr(connptr, 503, HTTP503ERROR); httperr(connptr, 503, HTTP503ERROR);
update_stats(STAT_BADCONN); update_stats(STAT_BADCONN);
goto COMMON_EXIT; goto EARLY_EXIT;
} }
safefree(buffer); safefree(buffer);
@ -288,8 +288,10 @@ static int process_method(struct conn_s *connptr)
return 0; return 0;
COMMON_EXIT: COMMON_EXIT:
safefree(request);
free_uri(uri); free_uri(uri);
EARLY_EXIT:
safefree(request);
return -1; return -1;
} }