Commit f6afd4ef authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Fix a log-uninitialized-buffer bug. 

Fix for 5647; bugfix on 0.2.1.5-alpha.
parent 2d276ab9

changes/bug5647

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Major bugfixes:

    - Avoid logging uninitialized data when unable to decode a hidden

      service descriptor cookie.  Fixes bug 5647; bugfix on 0.2.1.5-alpha.

src/or/routerparse.c

+1 −2
Original line number Diff line number Diff line
@@ -5056,7 +5056,6 @@ rend_parse_client_keys(strmap_t *parsed_clients, const char *ckstr) 
  while (!strcmpstart(current_entry, "client-name ")) {

    rend_authorized_client_t *parsed_entry;

    size_t len;

    char descriptor_cookie_base64[REND_DESC_COOKIE_LEN_BASE64+2+1];

    char descriptor_cookie_tmp[REND_DESC_COOKIE_LEN+2];

    /* Determine end of string. */

    const char *eos = strstr(current_entry, "\nclient-name ");
@@ -5125,7 +5124,7 @@ rend_parse_client_keys(strmap_t *parsed_clients, const char *ckstr) 
                       tok->args[0], REND_DESC_COOKIE_LEN_BASE64+2+1)

           != REND_DESC_COOKIE_LEN)) {

      log_warn(LD_REND, "Descriptor cookie contains illegal characters: "

                        "%s", descriptor_cookie_base64);

               "%s", escaped(tok->args[0]));

      goto err;

    }

    memcpy(parsed_entry->descriptor_cookie, descriptor_cookie_tmp,