From cb5d54e2e995f0bb88815c73be79aa5257a1123a Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Thu, 27 Feb 2014 18:08:34 +0000 Subject: [PATCH] Commit 5 on 6 to fix reentrance (incomplete Zlib header or validation bytes) in mod_deflate's output and input filters. PR 46146 (patches from duplicated PR 55666) Handle Zlib flags in the inflate input filter as in the output filter, using consume_zlib_flags(). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572670 13f79535-47bb-0310-9956-ffa450edef68 --- modules/filters/mod_deflate.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/filters/mod_deflate.c b/modules/filters/mod_deflate.c index eed159b2301..a50bc48fc82 100644 --- a/modules/filters/mod_deflate.c +++ b/modules/filters/mod_deflate.c @@ -1087,10 +1087,10 @@ static apr_status_t deflate_in_filter(ap_filter_t *f, return APR_EGENERAL; } - /* We can't handle flags for now. */ - if (ctx->header[3] != 0) { + ctx->zlib_flags = ctx->header[3]; + if ((ctx->zlib_flags & RESERVED)) { ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01388) - "Zlib: Unsupported flags %02x", (int)ctx->header[3]); + "Zlib: Invalid flags %02x", ctx->zlib_flags); return APR_EGENERAL; } @@ -1188,6 +1188,16 @@ static apr_status_t deflate_in_filter(ap_filter_t *f, /* read */ apr_bucket_read(bkt, &data, &len, APR_BLOCK_READ); + if (ctx->zlib_flags) { + rv = consume_zlib_flags(ctx, &data, &len); + if (rv == APR_SUCCESS) { + ctx->zlib_flags = 0; + } + if (rv == APR_INCOMPLETE || !len) { + continue; + } + } + /* pass through zlib inflate. */ ctx->stream.next_in = (unsigned char *)data; ctx->stream.avail_in = len; -- 2.47.3