Bläddra i källkod

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.
Daniel Pinto 8 år sedan
förälder
incheckning
f8ccf8d9a9
1 ändrade filer med 2 tillägg och 1 borttagningar
  1. 2 1
      src/common/confline.c

+ 2 - 1
src/common/confline.c

@@ -300,7 +300,8 @@ config_process_include(const char *path, int recursion_level, int extended,
     tor_free(config_file);
     tor_free(config_file);
 
 
     **next = included_list;
     **next = included_list;
-    *next = &(*list_last)->next;
+    if (*list_last)
+      *next = &(*list_last)->next;
 
 
   } SMARTLIST_FOREACH_END(config_file);
   } SMARTLIST_FOREACH_END(config_file);
   smartlist_free(config_files);
   smartlist_free(config_files);