From 15490816da0f8b651d67acef9c7f4e5bf9652ce2 Mon Sep 17 00:00:00 2001 From: Daniel Pinto Date: Sun, 22 Sep 2019 22:30:48 +0100 Subject: Fix bug when %including folder with comment only files. #31408 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. --- changes/bug31408 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/bug31408 (limited to 'changes/bug31408') diff --git a/changes/bug31408 b/changes/bug31408 new file mode 100644 index 0000000000..7a6744cee4 --- /dev/null +++ b/changes/bug31408 @@ -0,0 +1,4 @@ + o Major bugfixes (torrc): + - Fix configuration files in a %included folder containing a + configuration file with only comments or whitespace being + ignored. Fixes bug 31408; bugfix on 0.4.0.5. -- cgit v1.2.3-54-g00ecf From 0614f839054a52e6e1a79a366fcc70da0691df66 Mon Sep 17 00:00:00 2001 From: teor Date: Mon, 23 Sep 2019 11:11:50 +1000 Subject: changes: use correct bugfix release, and reword changes file for 31408 --- changes/bug31408 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'changes/bug31408') diff --git a/changes/bug31408 b/changes/bug31408 index 7a6744cee4..3e4ffa927d 100644 --- a/changes/bug31408 +++ b/changes/bug31408 @@ -1,4 +1,5 @@ o Major bugfixes (torrc): - - Fix configuration files in a %included folder containing a - configuration file with only comments or whitespace being - ignored. Fixes bug 31408; bugfix on 0.4.0.5. + - Stop ignoring torrc options after an %include directive, when the + included directory ends with a file that does not contain any config + options. (But does contain comments or whitespace.) + Fixes bug 31408; bugfix on 0.3.1.1-alpha. -- cgit v1.2.3-54-g00ecf