socks5_connect(): Deal with domain names in the socks reply

[privoxy.git] / parsers.c

diff --git a/parsers.c b/parsers.c
index 14aa99e..1cb46df 100644 (file)
--- a/parsers.c
+++ b/parsers.c
@@ -540,7 +540,7 @@ jb_err decompress_iob(struct client_state *csp)
 
    cur = csp->iob->cur;
 
-   if (bufsize < (size_t)10)
+   if (old_size < (size_t)10)
    {
       /*
        * This is to protect the parsing of gzipped data,
@@ -577,7 +577,8 @@ jb_err decompress_iob(struct client_state *csp)
        || ((*cur++ & 0xff) != GZIP_IDENTIFIER_2)
        || (*cur++ != Z_DEFLATED))
       {
-         log_error(LOG_LEVEL_ERROR, "Invalid gzip header when decompressing");
+         log_error(LOG_LEVEL_ERROR,
+            "Invalid gzip header when decompressing.");
          return JB_ERR_COMPRESS;
       }
       else
@@ -586,7 +587,8 @@ jb_err decompress_iob(struct client_state *csp)
          if (flags & GZIP_FLAG_RESERVED_BITS)
          {
             /* The gzip header has reserved bits set; bail out. */
-            log_error(LOG_LEVEL_ERROR, "Invalid gzip header flags when decompressing");
+            log_error(LOG_LEVEL_ERROR,
+               "Invalid gzip header flags when decompressing.");
             return JB_ERR_COMPRESS;
          }
 
@@ -606,8 +608,16 @@ jb_err decompress_iob(struct client_state *csp)
              * XXX: this code is untested and should probably be removed.
              */
             int skip_bytes;
+
+            if (cur + 2 >= csp->iob->eod)
+            {
+               log_error(LOG_LEVEL_ERROR,
+                  "gzip extra field flag set but insufficient data available.");
+               return JB_ERR_COMPRESS;
+            }
+
             skip_bytes = *cur++;
-            skip_bytes += *cur++ << 8;
+            skip_bytes += (unsigned char)*cur++ << 8;
 
             /*
              * The number of bytes to skip should be positive
@@ -616,12 +626,14 @@ jb_err decompress_iob(struct client_state *csp)
             if ((skip_bytes < 0) || (skip_bytes >= (csp->iob->eod - cur)))
             {
                log_error(LOG_LEVEL_ERROR,
-                  "Unreasonable amount of bytes to skip (%d). Stopping decompression",
+                  "Unreasonable amount of bytes to skip (%d). "
+                  "Stopping decompression.",
                   skip_bytes);
                return JB_ERR_COMPRESS;
             }
             log_error(LOG_LEVEL_INFO,
-               "Skipping %d bytes for gzip compression. Does this sound right?",
+               "Skipping %d bytes for gzip compression. "
+               "Does this sound right?",
                skip_bytes);
             cur += skip_bytes;
          }
@@ -630,14 +642,14 @@ jb_err decompress_iob(struct client_state *csp)
          if (flags & GZIP_FLAG_FILE_NAME)
          {
             /* A null-terminated string is supposed to follow. */
-            while (*cur++ && (cur < csp->iob->eod));
+            while ((cur < csp->iob->eod) && *cur++);
          }
 
          /* Skip the comment if necessary. */
          if (flags & GZIP_FLAG_COMMENT)
          {
             /* A null-terminated string is supposed to follow. */
-            while (*cur++ && (cur < csp->iob->eod));
+            while ((cur < csp->iob->eod) && *cur++);
          }
 
          /* Skip the CRC if necessary. */
@@ -681,7 +693,7 @@ jb_err decompress_iob(struct client_state *csp)
    else
    {
       log_error(LOG_LEVEL_ERROR,
-         "Unable to determine compression format for decompression");
+         "Unable to determine compression format for decompression.");
       return JB_ERR_COMPRESS;
    }
 
@@ -698,19 +710,19 @@ jb_err decompress_iob(struct client_state *csp)
     */
    if (inflateInit2(&zstr, -MAX_WBITS) != Z_OK)
    {
-      log_error(LOG_LEVEL_ERROR, "Error initializing decompression");
+      log_error(LOG_LEVEL_ERROR, "Error initializing decompression.");
       return JB_ERR_COMPRESS;
    }
 
    /*
     * Next, we allocate new storage for the inflated data.
     * We don't modify the existing iob yet, so in case there
-    * is error in decompression we can recover gracefully.
+    * is an error in decompression we can recover gracefully.
     */
    buf = zalloc(bufsize);
    if (NULL == buf)
    {
-      log_error(LOG_LEVEL_ERROR, "Out of memory decompressing iob");
+      log_error(LOG_LEVEL_ERROR, "Out of memory decompressing iob.");
       return JB_ERR_MEMORY;
    }
 
@@ -746,7 +758,8 @@ jb_err decompress_iob(struct client_state *csp)
        */
       if (bufsize >= csp->config->buffer_limit)
       {
-         log_error(LOG_LEVEL_ERROR, "Buffer limit reached while decompressing iob");
+         log_error(LOG_LEVEL_ERROR,
+            "Buffer limit reached while decompressing iob.");
          freez(buf);
          inflateEnd(&zstr);
          return JB_ERR_MEMORY;
@@ -765,15 +778,17 @@ jb_err decompress_iob(struct client_state *csp)
       tmpbuf = realloc(buf, bufsize);
       if (NULL == tmpbuf)
       {
-         log_error(LOG_LEVEL_ERROR, "Out of memory decompressing iob");
+         log_error(LOG_LEVEL_ERROR,
+            "Out of memory decompressing iob.");
          freez(buf);
          inflateEnd(&zstr);
          return JB_ERR_MEMORY;
       }
       else
       {
+#ifndef NDEBUG
          char *oldnext_out = (char *)zstr.next_out;
-
+#endif
          /*
           * Update the fields for inflate() to use the new
           * buffer, which may be in a location different from
@@ -818,6 +833,7 @@ jb_err decompress_iob(struct client_state *csp)
       log_error(LOG_LEVEL_ERROR,
          "Unexpected error while decompressing to the buffer (iob): %s",
          zstr.msg);
+      freez(buf);
       return JB_ERR_COMPRESS;
    }
 
@@ -859,7 +875,8 @@ jb_err decompress_iob(struct client_state *csp)
    else
    {
       /* It seems that zlib did something weird. */
-      log_error(LOG_LEVEL_ERROR, "Inconsistent buffer after decompression");
+      log_error(LOG_LEVEL_ERROR,
+         "Inconsistent buffer after decompression.");
       return JB_ERR_COMPRESS;
    }
 
@@ -1284,6 +1301,17 @@ jb_err sed(struct client_state *csp, int filter_server_headers)
       v++;
    }
 
+   if (filter_server_headers &&
+      (csp->flags & CSP_FLAG_SERVER_CONTENT_LENGTH_SET) &&
+      (csp->flags & CSP_FLAG_CHUNKED))
+   {
+      /* RFC 2616 4.4 3 */
+      log_error(LOG_LEVEL_HEADER, "Ignoring the Content-Length header "
+         "sent by the server as the response is chunk-encoded.");
+      csp->flags &= ~CSP_FLAG_CONTENT_LENGTH_SET;
+      csp->expected_content_length = 0;
+   }
+
    /* place additional headers on the csp->headers list */
    while ((err == JB_ERR_OK) && (*f))
    {
@@ -4600,7 +4628,10 @@ static jb_err parse_time_header(const char *header, time_t *result)
     * through sed() which requires a header name followed by
     * a colon.
     */
-   assert(header_time != NULL);
+   if (header_time == NULL)
+   {
+      return JB_ERR_PARSE;
+   }
 
    header_time++;
    if (*header_time == ' ')