Fix bug when %including folder with comment only files. #31408 #1348
Conversation
When processing a %included folder, a bug caused the pointer to the last element of the options list to be set to NULL when processing a file with only comments or whitepace. This could cause options from other files on the same folder to be discarded depending on the lines after the affected %include.
Pull Request Test Coverage Report for Build 6357
|
Jigsaw52
reviewed
Sep 23, 2019
changes/bug31408
Outdated
| @@ -0,0 +1,4 @@ | |||
| o Major bugfixes (torrc): | |||
| - Stop ignoring torrc options after an %include directive, when the | |||
| included directory ends with an empty file. (Or a file only containing | |||
I believe empty (0 byte) files will not cause this problem. Empty files are skipped when building the list of files for a %include directive (see config_get_file_list in conffile.c) and they do not go through the buggy code. Also, the file src/test/conf_examples/include_bug_31408/included/02_empty.inc added in this commit should have some content.
You're right, I originally had a comment in the file, but I think I dropped it when I was trying to minimise the test case. I'll fix the changes file and the test.
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.
When processing a %included folder, a bug caused the pointer to
the last element of the options list to be set to NULL when
processing a file with only comments or whitepace. This could
cause options from other files on the same folder to be
discarded depending on the lines after the affected %include.
The text was updated successfully, but these errors were encountered: