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

Add support to limit the maximum size of the input line (to 128KB which

Browse Source 
should be _more_ than enough for any header line. :)
This commit is contained in:
Robert James Kaes 2001-11-25 02:21:46 +00:00
parent 09dbdbc3d7
commit 8dc7035fbc
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sock.c
View File

@ -1,4 +1,4 @@
/* $Id: sock.c,v 1.17 2001-11-23 01:18:43 rjkaes Exp $ /* $Id: sock.c,v 1.18 2001-11-25 02:21:46 rjkaes Exp $
* *
* Sockets are created and destroyed here. When a new connection comes in from * Sockets are created and destroyed here. When a new connection comes in from
* a client, we need to copy the socket and the create a second socket to the * a client, we need to copy the socket and the create a second socket to the
@ -268,6 +268,7 @@ safe_read(int fd, void *buffer, size_t count)
* termination), 0 if the socket was closed, and -1 on all other errors. * termination), 0 if the socket was closed, and -1 on all other errors.
*/ */
#define SEGMENT_LEN (512) #define SEGMENT_LEN (512)
#define MAXIMUM_BUFFER_LENGTH (128 * 1024)
ssize_t ssize_t
readline(int fd, char **whole_buffer) readline(int fd, char **whole_buffer)
{ {
@ -305,6 +306,15 @@ readline(int fd, char **whole_buffer)
whole_buffer_len += diff; whole_buffer_len += diff;
/*
* Don't allow the buffer to grow without bound. If we
* get to more than MAXIMUM_BUFFER_LENGTH close.
*/
if (whole_buffer_len > MAXIMUM_BUFFER_LENGTH) {
ret = -EOUTRANGE;
goto CLEANUP;
}
line_ptr->data = safemalloc(diff); line_ptr->data = safemalloc(diff);
if (!line_ptr->data) { if (!line_ptr->data) {
ret = -ENOMEMORY; ret = -ENOMEMORY;