summaryrefslogtreecommitdiff
path: root/src/common/util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-12-22 15:58:49 -0500
committerNick Mathewson <nickm@torproject.org>2014-12-22 15:58:49 -0500
commit6d728ba8801031b27937436cbcad033f4406a8b5 (patch)
tree46d2743671c256069ce9587164acf42659083c70 /src/common/util.c
parent5b55778c86b88329725521d2c93829a9c9ad3501 (diff)
parent47760c7ba5f1c87c945f4a018e3b3da6d127a8b9 (diff)
downloadtor-6d728ba8801031b27937436cbcad033f4406a8b5.tar.gz
tor-6d728ba8801031b27937436cbcad033f4406a8b5.zip
Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5
Diffstat (limited to 'src/common/util.c')
-rw-r--r--src/common/util.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 2d7893b38a..04cc6b12c6 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1129,6 +1129,9 @@ base16_decode(char *dest, size_t destlen, const char *src, size_t srclen)
return -1;
if (destlen < srclen/2 || destlen > SIZE_T_CEILING)
return -1;
+
+ memset(dest, 0, destlen);
+
end = src+srclen;
while (src<end) {
v1 = hex_decode_digit_(*src);