Skip to content
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

Fix various memory corruption and unwanted behavior scenarios #591

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Fix various memory corruption and unwanted behavior scenarios #591

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b6ad5a6
Fix possible memory corruption when using upstream requests
sobitcorp Nov 1, 2020
11b8387
Respect client_max_body_size for incoming websocket messages
sobitcorp Nov 1, 2020
4c37623
Fix memory corruption in is_utf8() when block being checked is >16KB
sobitcorp Nov 2, 2020
14514b6
Fix file-cached messages (over 16KB) not getting passed to upstream
sobitcorp Nov 2, 2020
00fdb66
Better handling of client_max_body_size limit for incoming websocket …
sobitcorp Nov 2, 2020
a5a1352
Better handling of client_max_body_size limit for incoming websocket …
sobitcorp Nov 2, 2020
aece64f
Better handling of client_max_body_size limit for incoming websocket …
sobitcorp Nov 2, 2020
579ac29
Fix crash when using X-Accel-Redirect with message forwarding
sobitcorp Nov 15, 2020
86eae8b
Fix crash when using X-Accel-Redirect with message forwarding
sobitcorp Nov 15, 2020
713fbcb
Fix crash when multi-id pubsub is closed by timeout
sobitcorp Dec 6, 2020
d19723c
Fix crash when multi-id pubsub is closed by HTTP DELETE
sobitcorp Dec 6, 2020
035d7c5
Fix crash when forwarding used without proxy_pass
sobitcorp Dec 6, 2020
9dfdc24
Fixed uninitialized result var
sobitcorp Feb 24, 2021
4bdc0f7
Fixed uninitialized result var - attempt 2
sobitcorp Feb 27, 2021
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
2 changes: 2 additions & 0 deletions src/subscribers/websocket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1091,6 +1091,8 @@ static ngx_buf_t *websocket_inflate_message(full_subscriber_t *fsub, ngx_buf_t *
z_stream *strm;
int rc;
ngx_buf_t *outbuf;

*result = 0;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems *result is still uninitialized if NGX_ZLIB is not defined (perhaps that does not happen, but it still seems wrong to write code that will not work).

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops... fixed


if(fsub->deflate.zstream_in == NULL) {
if((fsub->deflate.zstream_in = ngx_calloc(sizeof(*strm), ngx_cycle->log)) == NULL) {
Expand Down