Add zlib inflated data size limit #167
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
| <<0, In/binary>> -> | ||
| {ok, In}; | ||
| <<1, Error/binary>> -> | ||
| {error, binary_to_list(Error)} | ||
| {error, erlang:binary_to_existing_atom(Error, latin1)} |
There was a problem hiding this comment.
Could you please, use ut8 here. I know that both latin1 and utf8 will work here, but in other places MongooseIM is using utf8 encoding (for example xml parser) so it's better to be coherent in all places.
|
Is everything fine now? :) |
| @@ -221,7 +221,10 @@ init([{SockMod, Socket}, Opts]) -> | |||
| {value, {_, XS}} -> XS; | |||
| _ -> false | |||
| end, | |||
| Zlib = lists:member(zlib, Opts), | |||
| Zlib = case lists:keysearch(zlib, 1, Opts) of | |||
There was a problem hiding this comment.
From man 3 lists:
This function is retained for backward compatibility.
The function lists:keyfind/3 (introduced in R13A) is in most cases more convenient.
There was a problem hiding this comment.
keysearch is used in this block of code multiple times, I wanted it to be consistent. Should we replace all keysearch occurences in the code then? :)
|
And now? :P |
Also replace keysearch with keyfind in c2s
|
Squashed formatting commits, should be ready for merge. |
michalwski
added a commit
that referenced
this pull request
Apr 9, 2014
Add zlib inflated data size limit
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.
Without such limit server can crash or use lots of resources when inflating data with very high compression ratio.