commit f8ccf8d9a9d7203107c55b73eda7473640fa19a9 Author: Daniel Pinto danielpinto52@gmail.com Date: Sun May 28 09:53:14 2017 +0100

Fix crash with %include

Fixes crash when including a folder that contains a non-empty file without any values followed by any other non-empty file. --- src/common/confline.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/confline.c b/src/common/confline.c index f04b7a8..c2122a1 100644 --- a/src/common/confline.c +++ b/src/common/confline.c @@ -300,7 +300,8 @@ config_process_include(const char *path, int recursion_level, int extended, tor_free(config_file);

**next = included_list; - *next = &(*list_last)->next; + if (*list_last) + *next = &(*list_last)->next;

} SMARTLIST_FOREACH_END(config_file); smartlist_free(config_files);