X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=fuzz.c;h=a637e7b3d37aea02934d4aa78e1cba1031a2ae32;hp=0e59a80f5f34c0f26b3722324d1b2392c2675917;hb=a473a2a85dbf5325b270a906e85785ba4b032503;hpb=f67b3326138f428863c21c7738e0c8db87fa6f5c

diff --git a/fuzz.c b/fuzz.c
index 0e59a80f..a637e7b3 100644
--- a/fuzz.c
+++ b/fuzz.c
@@ -1,6 +1,6 @@
 /*********************************************************************
  *
- * File        :  $Source:$
+ * File        :  $Source: /cvsroot/ijbswa/current/fuzz.c,v $
  *
  * Purpose     :  Fuzz-related functions for Privoxy.
  *
@@ -59,9 +59,7 @@ static int fuzz_deflate(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_filter(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_gif(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_gzip(struct client_state *csp, char *fuzz_input_file);
-#ifdef FUZZ_SOCKS
 static int fuzz_socks(struct client_state *csp, char *fuzz_input_file);
-#endif
 static int fuzz_pcrs_substitute(struct client_state *csp, char *fuzz_input_file);
 static int fuzz_server_header(struct client_state *csp, char *fuzz_input_file);
 
@@ -85,9 +83,7 @@ static const struct fuzz_mode fuzz_modes[] = {
    { "pcrs-substitute", "A pcrs-substitute to compile. Not a whole pcrs job! Example: Bla $1 bla \x43 $3 blah.", 1, fuzz_pcrs_substitute },
    { "server-header", "Server header to parse.", 1, fuzz_server_header },
    { "server-response", "Server response to parse.", 1, fuzz_server_response },
-#ifdef FUZZ_SOCKS
    { "socks", "A socks server response. Only reads from stdin!", 1, fuzz_socks },
-#endif
 };
 
 /*********************************************************************
@@ -428,13 +424,12 @@ static int fuzz_gzip(struct client_state *csp, char *fuzz_input_file)
 }
 
 
-#ifdef FUZZ_SOCKS
 /*********************************************************************
  *
  * Function    :  fuzz_socks
  *
  * Description :  Treat the fuzzed input as a socks response.
- *                XXX: This is pretty useless as parsing socks repsonse
+ *                XXX: This is pretty useless as parsing socks response
  *                     is trivial.
  *
  * Parameters  :
@@ -448,7 +443,6 @@ static int fuzz_socks(struct client_state *csp, char *fuzz_input_file)
 {
    return(JB_ERR_OK == socks_fuzz(csp));
 }
-#endif
 
 
 /*********************************************************************
@@ -536,8 +530,6 @@ int fuzz_server_header(struct client_state *csp, char *fuzz_input_file)
  * Description :  Process the fuzzed input in a specified file treating
  *                it like the input type specified.
  *
- *                XXX: Does not check malloc succcess.
- *
  * Parameters  :
  *          1  :  fuzz_input_type = Type of input.
  *          2  :  fuzz_input_file = File to read the input from.
@@ -555,6 +547,8 @@ int process_fuzzed_input(char *fuzz_input_type, char *fuzz_input_file)
    csp = &csp_stack_storage;
    csp->config = &config_stack_storage;
    csp->config->buffer_limit = 4096 * 1024;
+   csp->config->receive_buffer_size = 4096;
+
    /* In --stfu mode, these will be ignored ... */
    set_debug_level(LOG_LEVEL_ACTIONS|LOG_LEVEL_CONNECT|LOG_LEVEL_DEANIMATE|LOG_LEVEL_INFO|LOG_LEVEL_ERROR|LOG_LEVEL_RE_FILTER|LOG_LEVEL_HEADER|LOG_LEVEL_WRITING|LOG_LEVEL_RECEIVED);