Attachment 855063 Details for Bug 1057695 – patch to allow decompression of files larger than 4GB

patch to allow decompression of files larger than 4GB

file_1057695.txt (text/plain), 1.78 KB, created by Lukas Bezdicka on 2014-01-24 15:51:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukas Bezdicka

Created: 2014-01-24 15:51:49 UTC

Size: 1.78 KB

patch

obsolete

>Author: Jan Chochol <jan.chochol@gooddata.com>
>Date:   Fri Jan 24 16:33:38 2014 -0800
>
>    Allow mod_deflate to decompress files larger than 4GB
>
>    gzip verification area do not contain original file size for files
>    larger than 4GB. It contains its size modulo 2^32 (due to only 4 bytes
>    reserved for such information).
>    This patch corrects the check, so mod_deflate is able to decompress
>    files with original size larger than 4GB (using same approach as gzip).
>
>===================================================================
>--- modules/filters/mod_deflate.c	(revision 1561027)
>+++ modules/filters/mod_deflate.c	(working copy)
>@@ -1125,7 +1125,8 @@
>                     }
>                     ctx->stream.next_in += 4;
>                     compLen = getLong(ctx->stream.next_in);
>-                    if (ctx->stream.total_out != compLen) {
>+                    /* gzip stores original size only as 4 byte value */
>+                    if ((ctx->stream.total_out & 0xFFFFFFFF) != compLen) {
>                         inflateEnd(&ctx->stream);
>                         ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, APLOGNO(01395)
>                                       "Zlib: Length %ld of inflated data does "
>@@ -1322,7 +1323,8 @@
>                 }
>                 ctx->validation_buffer += VALIDATION_SIZE / 2;
>                 compLen = getLong(ctx->validation_buffer);
>-                if (ctx->stream.total_out != compLen) {
>+                /* gzip stores original size only as 4 byte value */
>+                if ((ctx->stream.total_out & 0xFFFFFFFF) != compLen) {
>                     ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, APLOGNO(01400)
>                                   "Zlib: Length of inflated stream invalid");
>                     return APR_EGENERAL;

Actions: View

Attachments on bug 1057695: 855063