Fix memory usage when reading input #94
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently, every time mod_zip reads 8KB, it allocates a new string, copies all existing data, and doesn't free the old string. This results in GBs of memory use for a 10MB input. Just use an nginx array which automatically doubles in size as needed. (Still leaks memory, but not as much.) Fixes evanmiller#67
sir-sigurd
reviewed
Aug 8, 2022
| @@ -220,6 +190,7 @@ ngx_http_zip_main_request_header_filter(ngx_http_request_t *r) | |||
| ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "mod_zip: X-Archive-Files found"); | |||
|
|
|||
| if ((ctx = ngx_pcalloc(r->pool, sizeof(ngx_http_zip_ctx_t))) == NULL | |||
| || ngx_array_init(&ctx->unparsed_request, r->pool, 64 * 1024, 1) == NGX_ERROR | |||
There was a problem hiding this comment.
Can't we use Content-Length header to know size of buffer to allocate?
There was a problem hiding this comment.
It might not be available if the input is being streamed.
(Could check if it's available and use it in that case - though not sure it's worth the extra complexity.)
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, every time mod_zip reads 8KB, it allocates a new string, copies all existing data,
and doesn't free the old string. This results in GBs of memory use for a 10MB input.
Just use an nginx array which automatically doubles in size as needed.
(Still leaks memory, but not as much.)
Fixes #67