diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-04-23 12:24:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-04-23 12:24:35 -0400 |
| commit | 54000d7ad9fc92136981da7c270e0646a5288bf3 (patch) | |
| tree | c73d7ac40a660eb03c5814565993d6880d12937b /src/or/routerparse.c | |
| parent | 9a81ed1d238e952429a53e7b38a4b6dd4bc5554a (diff) | |
| parent | 6f5f38a0bc60d3be9b6cf02e29b9065869cf6af8 (diff) | |
| download | tor-54000d7ad9fc92136981da7c270e0646a5288bf3.tar.gz tor-54000d7ad9fc92136981da7c270e0646a5288bf3.zip | |
Merge remote-tracking branch 'dgoulet/bug14847_027_06'
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index d2eca62491..f15aeeb0cf 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4575,8 +4575,7 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, tok = find_by_keyword(tokens, R_RENDEZVOUS_SERVICE_DESCRIPTOR); tor_assert(tok == smartlist_get(tokens, 0)); tor_assert(tok->n_args == 1); - if (strlen(tok->args[0]) != REND_DESC_ID_V2_LEN_BASE32 || - strspn(tok->args[0], BASE32_CHARS) != REND_DESC_ID_V2_LEN_BASE32) { + if (!rend_valid_descriptor_id(tok->args[0])) { log_warn(LD_REND, "Invalid descriptor ID: '%s'", tok->args[0]); goto err; } |