summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-07-01 12:56:14 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-01 12:56:14 -0400
commit06f0c1aa6a4ad0a6dfc93b1637214c307feed566 (patch)
treef7096b2669837cb8a8b8c77e6baefd1595247c71
parent5cf725e3c691ac3e5674ce64bd2be410a9cb0ede (diff)
parentbc91cb6e459042e11be11e50050ac086fdcb33dd (diff)
downloadtor-06f0c1aa6a4ad0a6dfc93b1637214c307feed566.tar.gz
tor-06f0c1aa6a4ad0a6dfc93b1637214c307feed566.zip
Merge branch 'cov217_022_squashed' into maint-0.2.2
-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 d114d8654e..7df9a2fcaa 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -2415,7 +2415,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)));