summaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-07-01 12:56:40 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-01 12:56:40 -0400
commit734e860d98e1874dcd92e69051806e53205ee0b0 (patch)
tree61f31b749be3aabf788a3a8b44d6383ed4e442ac /src/or/dirserv.c
parent0b536469ee8a6d437cd939cbcdaa56039e27cdcb (diff)
parent06f0c1aa6a4ad0a6dfc93b1637214c307feed566 (diff)
downloadtor-734e860d98e1874dcd92e69051806e53205ee0b0.tar.gz
tor-734e860d98e1874dcd92e69051806e53205ee0b0.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 33796fc2de..0ea1ef6489 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2440,7 +2440,7 @@ measured_bw_line_parse(measured_bw_line_t *out, const char *orig_line)
tor_free(line);
return -1;
}
- strncpy(out->node_hex, cp, sizeof(out->node_hex));
+ strlcpy(out->node_hex, cp, sizeof(out->node_hex));
got_node_id=1;
}
} while ((cp = tor_strtok_r(NULL, " \t", &strtok_state)));