diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-13 21:50:07 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-13 21:50:07 -0500 |
| commit | 02a43e5eb65a81e28765c2183c2b3087cf5882fe (patch) | |
| tree | 42bcd8bf6917ff6e5524f0bf30799597caee4c93 /src/or | |
| parent | b17aa28e46d193bb0beb3a9c6fabd1df9daff6f0 (diff) | |
| parent | 0e8be13b9fa4dc794519a4c74197c313a202b6b5 (diff) | |
| download | tor-02a43e5eb65a81e28765c2183c2b3087cf5882fe.tar tor-02a43e5eb65a81e28765c2183c2b3087cf5882fe.tar.gz | |
Merge remote-tracking branch 'public/bug7059'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/networkstatus.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index f0efe80c7..f33de4c18 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2374,8 +2374,11 @@ getinfo_helper_networkstatus(control_connection_t *conn, return 0; } else if (!strcmpstart(question, "ns/id/")) { char d[DIGEST_LEN]; + const char *q = question + 6; + if (*q == '$') + ++q; - if (base16_decode(d, DIGEST_LEN, question+6, strlen(question+6))) { + if (base16_decode(d, DIGEST_LEN, q, strlen(q))) { *errmsg = "Data not decodeable as hex"; return -1; } |