Commit dfc9c6a0 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1

parents cfd7b118 adc31001

changes/bug2750

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  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.

src/or/routerparse.c

+3 −1
Original line number Diff line number Diff line
@@ -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;

  }