aboutsummaryrefslogtreecommitdiff
path: root/src/common/util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-12-22 16:02:47 -0500
committerNick Mathewson <nickm@torproject.org>2014-12-22 16:02:47 -0500
commit0965bbd5ac3a3dc4016a0c13082506ac2039905e (patch)
tree14a6c733beb970ec93200dd960ff8375074c2d5e /src/common/util.c
parent03d2df62f614f97d2b5cf52518565ce91333ba87 (diff)
parent6d728ba8801031b27937436cbcad033f4406a8b5 (diff)
downloadtor-0965bbd5ac3a3dc4016a0c13082506ac2039905e.tar.gz
tor-0965bbd5ac3a3dc4016a0c13082506ac2039905e.zip
Merge remote-tracking branch 'origin/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 c52b279f1c..6226dd74e9 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1268,6 +1268,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);