Don't use strlen() on a NULL pointer.

[tinc] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index c5467d2..0727953 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -339,7 +339,7 @@ bool read_config_file(avl_tree_t *config_tree, const char *fname) {
 
 void read_config_options(avl_tree_t *config_tree, const char *prefix) {
        list_node_t *node, *next;
-       size_t prefix_len = strlen(prefix);
+       size_t prefix_len = prefix ? strlen(prefix) : 0;
 
        for(node = cmdline_conf->tail; node; node = next) {
                config_t *cfg = (config_t *)node->data;
@@ -358,7 +358,6 @@ void read_config_options(avl_tree_t *config_tree, const char *prefix) {
 }
 
 bool read_server_config() {
-       list_node_t *node, *next;
        char *fname;
        bool x;
 
@@ -377,8 +376,6 @@ bool read_server_config() {
 }
 
 bool read_connection_config(connection_t *c) {
-       list_node_t *node, *next;
-       size_t name_len = strlen(c->name);
        char *fname;
        bool x;