[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm@xxxxxxxxxxxxxx]

commit 68dfbd5ef433b830059baa08d48589518db05d22
Merge: fe2588a5a ea14d3408
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jun 29 13:06:15 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/ticket26467            |  3 +++
 src/or/directory.c             |  1 +
 src/or/hs_descriptor.c         |  1 +
 src/test/hs_test_helpers.c     |  6 ++++++
 src/test/test_channelpadding.c |  2 ++
 src/test/test_hs_descriptor.c  | 11 +++++------
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --cc src/or/hs_descriptor.c
index fef0607c1,8e10c0fff..582ac9cb7
--- a/src/or/hs_descriptor.c
+++ b/src/or/hs_descriptor.c
@@@ -1115,16 -1133,8 +1115,17 @@@ decode_link_specifiers(const char *enco
        memcpy(hs_spec->u.legacy_id, link_specifier_getarray_un_legacy_id(ls),
               sizeof(hs_spec->u.legacy_id));
        break;
 +    case LS_ED25519_ID:
 +      /* Both are known at compile time so let's make sure they are the same
 +       * else we can copy memory out of bound. */
 +      tor_assert(link_specifier_getlen_un_ed25519_id(ls) ==
 +                 sizeof(hs_spec->u.ed25519_id));
 +      memcpy(hs_spec->u.ed25519_id,
 +             link_specifier_getconstarray_un_ed25519_id(ls),
 +             sizeof(hs_spec->u.ed25519_id));
 +      break;
      default:
+       tor_free(hs_spec);
        goto err;
      }
  



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits