diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-19 12:30:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-19 12:30:50 -0400 |
| commit | dfc9c6a0f9c0488e437dfbf1181041ca0e194f1d (patch) | |
| tree | 4b20c69ef78b033f1360af161d062c4baaf77c1b | |
| parent | cfd7b118a700f8dba53915118b1be4ac267db23b (diff) | |
| parent | adc31001c2f9923f8fcee2141d233200c95373cf (diff) | |
| download | tor-dfc9c6a0f9c0488e437dfbf1181041ca0e194f1d.tar.gz tor-dfc9c6a0f9c0488e437dfbf1181041ca0e194f1d.zip | |
Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1
| -rw-r--r-- | changes/bug2750 | 6 | ||||
| -rw-r--r-- | src/or/routerparse.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changes/bug2750 b/changes/bug2750 new file mode 100644 index 0000000000..4371a0a4ee --- /dev/null +++ b/changes/bug2750 @@ -0,0 +1,6 @@ + o Minor bugfixes + - Correct the warning displayed when a rendezvous descriptor exceeds + the maximum size. Fixes bug 2750; bugfix on 0.2.1.5-alpha. Found + by John Brooks. + + diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 1faa177edf..3d73f8de68 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3628,8 +3628,10 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, eos = eos + 1; /* Check length. */ if (strlen(desc) > REND_DESC_MAX_SIZE) { + /* XXX023 If we are parsing this descriptor as a server, this + * should be a protocol warning. */ log_warn(LD_REND, "Descriptor length is %i which exceeds " - "maximum rendezvous descriptor size of %i kilobytes.", + "maximum rendezvous descriptor size of %i bytes.", (int)strlen(desc), REND_DESC_MAX_SIZE); goto err; } |