Skip to content

[2.4.x] Merge changes to mod_deflate #911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
notroj wants to merge 1 commit into
base: 2.4.x
Choose a base branch
from
+6 −2
Open

[2.4.x] Merge changes to mod_deflate #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changes-entries/deflate-xlen-unsigned.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*) mod_deflate: Read the gzip extra-field (FEXTRA) length as unsigned so a
length byte with the high bit set is no longer sign-extended, fixing
inflation of gzip streams that carry an extra field.
[arshiya tabasum <arshi bugqore.com>]
4 changes: 2 additions & 2 deletions modules/filters/mod_deflate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1053,7 +1053,7 @@ static apr_status_t consume_zlib_flags(deflate_ctx *ctx,
if (!*len) {
return APR_INCOMPLETE;
}
ctx->consume_len = (unsigned int)**data;
ctx->consume_len = (unsigned int)(unsigned char)**data;
ctx->consume_pos++;
++*data;
--*len;
Expand All @@ -1062,7 +1062,7 @@ static apr_status_t consume_zlib_flags(deflate_ctx *ctx,
if (!*len) {
return APR_INCOMPLETE;
}
ctx->consume_len += ((unsigned int)**data) << 8;
ctx->consume_len += ((unsigned int)(unsigned char)**data) << 8;
ctx->consume_pos++;
++*data;
--*len;
Expand Down
Loading