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

Add explicit check that we have reached the end of the settings stream when parsing settings #12451

Merged
merged 1 commit into from Jul 24, 2015

Conversation

jasontedor
Copy link
Member

Settings are currently parsed by looping over the tokens until an END_OBJECT token is reached. However, this does not mean that the end of the settings stream was reached. This can occur, for example, when parsing a YAML settings file with inconsistent indentation. Currently in this case, some settings will be silently ignored. This commit forces a check that we have in fact reached the end of the settings stream.

Closes #12382

…m when parsing settings

Settings are currently parsed by looping over the tokens until an END_OBJECT token is reached. However, this does not mean that the end of
the settings stream was reached. This can occur, for example, when parsing a YAML settings file with inconsistent indentation. Currently
in this case, some settings will be silently ignored. This commit forces a check that we have in fact reached the end of the settings
stream.

Closes #12382
@dakrone
Copy link
Member

dakrone commented Jul 24, 2015

LGTM, can you add the versions this will be merged to?

@jasontedor
Copy link
Member Author

@dakrone Done. Thanks for reviewing.

jasontedor added a commit that referenced this pull request Jul 24, 2015
Add explicit check that we have reached the end of the settings stream when parsing settings
@jasontedor jasontedor merged commit 267afe8 into elastic:master Jul 24, 2015
@jasontedor jasontedor deleted the fix/12382 branch July 24, 2015 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants