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.

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 edge case in SyslogOctetCountFrameDecoder #1339

Merged
merged 1 commit into from Aug 5, 2015
Merged

Fix edge case in SyslogOctetCountFrameDecoder #1339

merged 1 commit into from Aug 5, 2015

Conversation

@bernd
Copy link
Member

@bernd bernd commented Aug 4, 2015

We have to take the skipped bytes (frame size value length + whitespace) into account when checking if the buffer has enough data to read the complete message.

This fixes an exception when reading from the buffer that mostly happened during high load situations.

Fixes #1105

We have to take the skipped bytes (frame size value length + whitespace)
into account when checking if the buffer has enough data to read the
complete message.

This fixes an exception when reading from the buffer that mostly
happened during high load situations.

Fixes #1105
@bernd bernd added this to the 1.2.0 milestone Aug 4, 2015
@kroepke
Copy link
Member

@kroepke kroepke commented Aug 4, 2015

lgtm! good work!

@joschi joschi self-assigned this Aug 5, 2015
@joschi
Copy link
Contributor

@joschi joschi commented Aug 5, 2015

LGTM. 👍

joschi added a commit that referenced this pull request Aug 5, 2015
Fix edge case in SyslogOctetCountFrameDecoder

Fixes #1105
@joschi joschi merged commit e3b90a8 into master Aug 5, 2015
2 checks passed
2 checks passed
ci Jenkins build graylog2-server-integration-pr 101 has succeeded
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@joschi joschi deleted the issue-1105 branch Aug 5, 2015
@joschi
Copy link
Contributor

@joschi joschi commented Aug 5, 2015

Does it make sense to back-port this fix to the 1.1 branch as well?

@kroepke
Copy link
Member

@kroepke kroepke commented Aug 5, 2015

I'd rather not, we are not that far off with 1.2 code freeze. IMHO we should only do this if something else forces us to do 1.1.6.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants
You can’t perform that action at this time.