torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace kludgy assert with something a little less awful, and avoid needless strlcpy in rend descriptor encoding.

Browse Source 
svn:r17818
This commit is contained in:
Nick Mathewson
2008-12-29 19:57:08 +00:00
parent 76a2e11f91
commit 45bd6c650d
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/rendcommon.c
+7 -3
View File
@@ -690,13 +690,17 @@ rend_encode_service_descriptor(rend_service_descriptor_t *desc,
for (i=0; i < smartlist_len(desc->intro_nodes); ++i) {
rend_intro_point_t *intro = smartlist_get(desc->intro_nodes, i);
char ipoint[HEX_DIGEST_LEN+2];
const size_t ipoint_len = HEX_DIGEST_LEN+1;
ipoint[0] = '$';
base16_encode(ipoint+1, HEX_DIGEST_LEN+1,
intro->extend_info->identity_digest,
DIGEST_LEN);
tor_assert(buflen + *str_out >= cp); /* XXX021 This assert is a kludge. */
strlcpy(cp, ipoint, buflen-(cp-*str_out));
cp += strlen(ipoint)+1;
tor_assert(strlen(ipoint) == ipoint_len);
/* Assert that appending ipoint and its NUL won't over overun the
* buffer. */
tor_assert(cp + ipoint_len+1 < *str_out + buflen);
memcpy(cp, ipoint, ipoint_len+1);
cp += ipoint_len+1;
}
note_crypto_pk_op(REND_SERVER);
r = crypto_pk_private_sign_digest(key, cp, *str_out, cp-*str_out);