summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@gmail.com>2011-10-26 17:13:56 +0200
committerNick Mathewson <nickm@torproject.org>2011-10-26 11:21:11 -0400
commit9d53c0091169e9b68d91c023124e1fed31909ffa (patch)
tree59d0347c6c5ff075fdb9ae8e642d18a0b9cdf6c7
parentbeb9097beda7cc82eec744878a2efd2810351158 (diff)
downloadtor-9d53c0091169e9b68d91c023124e1fed31909ffa.tar.gz
tor-9d53c0091169e9b68d91c023124e1fed31909ffa.zip
Fix a NULL pointer dereference in parse_server_transport_line().
-rw-r--r--src/or/config.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index ec9d84b374..3080da0485 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4985,8 +4985,10 @@ parse_server_transport_line(const char *line, int validate_only)
done:
SMARTLIST_FOREACH(items, char*, s, tor_free(s));
smartlist_free(items);
- SMARTLIST_FOREACH(transport_list, char*, s, tor_free(s));
- smartlist_free(transport_list);
+ if (transport_list) {
+ SMARTLIST_FOREACH(transport_list, char*, s, tor_free(s));
+ smartlist_free(transport_list);
+ }
return r;
}