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

Cleaned up the code in handle_connection() and added a NULL pointer test

Browse Source 
in the free request function.
This commit is contained in:
Robert James Kaes 2001-10-22 16:08:29 +00:00
parent ad743c1e41
commit 358b2781af
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,5 +1,10 @@
2001-10-22 Robert James Kaes <rjkaes@flarenet.com>
* src/reqs.c (free_request_struct): Added a test to return if the
pointer is NULL.
(handle_connection): Cleaned up the code to better handle the
cause where the request is NULL.
* src/sock.c (getpeer_string):
* src/sock.c (getpeer_ip): When the DNS lookup fails, we need to
initialized the user's buffer to an empty string; otherwise, the

49
src/reqs.c
View File

@ -1,4 +1,4 @@
/* $Id: reqs.c,v 1.30 2001-10-19 18:03:49 rjkaes Exp $
/* $Id: reqs.c,v 1.31 2001-10-22 16:08:29 rjkaes Exp $
*
* This is where all the work in tinyproxy is actually done. Incoming
* connections have a new thread created for them. The thread then
@ -111,6 +111,9 @@ struct request_s {
static void free_request_struct(struct request_s *request)
{
if (!request)
return;
safefree(request->method);
safefree(request->protocol);
@ -836,34 +839,34 @@ internal_proxy:
safefree(request_line);
if (!request) {
update_stats(STAT_BADCONN);
if (!connptr->send_message) {
update_stats(STAT_BADCONN);
destroy_conn(connptr);
return;
}
} else {
#ifdef UPSTREAM_SUPPORT
if (config.upstream_name && config.upstream_port != -1) {
if (connect_to_upstream(connptr, request) < 0)
goto send_error;
} else {
#endif
connptr->server_fd = opensock(request->host, request->port);
if (connptr->server_fd < 0) {
httperr(connptr, 500, HTTP500ERROR);
goto send_error;
}
log_message(LOG_CONN, "Established connection to host \"%s\" using file descriptor %d.", request->host, connptr->server_fd);
if (!connptr->ssl)
establish_http_connection(connptr, request);
#ifdef UPSTREAM_SUPPORT
}
#endif
goto send_error;
}
#ifdef UPSTREAM_SUPPORT
if (config.upstream_name && config.upstream_port != -1) {
if (connect_to_upstream(connptr, request) < 0)
goto send_error;
} else {
#endif
connptr->server_fd = opensock(request->host, request->port);
if (connptr->server_fd < 0) {
httperr(connptr, 500, HTTP500ERROR);
goto send_error;
}
log_message(LOG_CONN, "Established connection to host \"%s\" using file descriptor %d.", request->host, connptr->server_fd);
if (!connptr->ssl)
establish_http_connection(connptr, request);
#ifdef UPSTREAM_SUPPORT
}
#endif
send_error:
free_request_struct(request);