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

Jump to bottom

Bug31408 master #1349

Merged
merged 4 commits into from Sep 25, 2019
Merged

Bug31408 master #1349

merged 4 commits into from Sep 25, 2019

Conversation

Reviewers

@Jigsaw52 Jigsaw52

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@teor2345 @coveralls @Jigsaw52 @torproject-pusher
@teor2345
Copy link
Contributor

@teor2345 teor2345 commented Sep 23, 2019

No description provided.

@Jigsaw52 @teor2345
Fix bug when %including folder with comment only files. #31408
1549081 
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.
@coveralls
Copy link

@coveralls coveralls commented Sep 23, 2019 •
edited

Pull Request Test Coverage Report for Build 6358

  • 4 of 4 (100.0%) changed or added relevant lines in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.02%) to 63.378%
Totals Coverage Status
Change from base Build 6356: 0.02%
Covered Lines: 47968
Relevant Lines: 75685
💛 - Coveralls

Jigsaw52
Jigsaw52 reviewed Sep 23, 2019
View changes
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
Copy link
Contributor

@Jigsaw52 Jigsaw52 Sep 23, 2019

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.

teor2345 added 3 commits Sep 24, 2019
@teor2345
changes: use correct bugfix release, and reword changes file for 31408
0614f83
@teor2345
Merge branch 'bug31408_035' into bug31408_master
876b3e2
@teor2345
test: a file with no config options, at the end of an %include directory
83fa962 
(The file must contain whitespace or comments to trigger the bug.)

Regression test for 31408.
@teor2345 teor2345 force-pushed the bug31408_master branch from 3e3d28f to 83fa962 Sep 24, 2019
@torproject-pusher torproject-pusher merged commit 83fa962 into torproject:master Sep 25, 2019
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment