Commit acd72d4e authored by Nick Mathewson's avatar Nick Mathewson 🦞
Browse files

Correctly copy microdescs/extrinfos with internal NUL bytes 

Fixes bug 8037; bugfix on 0.2.0.1-alpha; reported by cypherpunks.
parent dfbd19df

changes/bug8037

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

    - Correctly store microdescriptors and extrainfo descriptors with

      an internal NUL byte. Fixes bug 8037; bugfix on 0.2.0.1-alpha.

      Bug reported by "cypherpunks".

src/common/util.c

+14 −0
Original line number Diff line number Diff line
@@ -282,6 +282,20 @@ tor_memdup_(const void *mem, size_t len DMALLOC_PARAMS) 
  return dup;

}



/** As tor_memdup(), but add an extra 0 byte at the end of the resulting

 * memory. */

void *

tor_memdup_nulterm(const void *mem, size_t len DMALLOC_PARAMS)

{

  char *dup;

  tor_assert(len < SIZE_T_CEILING+1);

  tor_assert(mem);

  dup = tor_malloc_(len+1 DMALLOC_FN_ARGS);

  memcpy(dup, mem, len);

  dup[len] = '\0';

  return dup;

}



/** Helper for places that need to take a function pointer to the right

 * spelling of "free()". */

void

src/common/util.h

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ char *tor_strndup_(const char *s, size_t n DMALLOC_PARAMS) 
  ATTR_MALLOC ATTR_NONNULL((1));

void *tor_memdup_(const void *mem, size_t len DMALLOC_PARAMS)

  ATTR_MALLOC ATTR_NONNULL((1));

void *tor_memdup_nulterm_(const void *mem, size_t len DMALLOC_PARAMS)

  ATTR_MALLOC ATTR_NONNULL((1));

void tor_free_(void *mem);

#ifdef USE_DMALLOC

extern int dmalloc_free(const char *file, const int line, void *pnt,
@@ -117,6 +119,7 @@ extern int dmalloc_free(const char *file, const int line, void *pnt, 
#define tor_strdup(s)          tor_strdup_(s DMALLOC_ARGS)

#define tor_strndup(s, n)      tor_strndup_(s, n DMALLOC_ARGS)

#define tor_memdup(s, n)       tor_memdup_(s, n DMALLOC_ARGS)

#define tor_memdup_nulterm(s, n)       tor_memdup_nulterm_(s, n DMALLOC_ARGS)



void tor_log_mallinfo(int severity);

src/or/routerparse.c

+2 −2
Original line number Diff line number Diff line
@@ -1494,7 +1494,7 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, 
  extrainfo = tor_malloc_zero(sizeof(extrainfo_t));

  extrainfo->cache_info.is_extrainfo = 1;

  if (cache_copy)

    extrainfo->cache_info.signed_descriptor_body = tor_strndup(s, end-s);

    extrainfo->cache_info.signed_descriptor_body = tor_memdup_nulterm(s, end-s);

  extrainfo->cache_info.signed_descriptor_len = end-s;

  memcpy(extrainfo->cache_info.signed_descriptor_digest, digest, DIGEST_LEN);
@@ -4237,7 +4237,7 @@ microdescs_parse_from_string(const char *s, const char *eos, 


      md->bodylen = start_of_next_microdesc - cp;

      if (copy_body)

        md->body = tor_strndup(cp, md->bodylen);

        md->body = tor_memdup_nulterm(cp, md->bodylen);

      else

        md->body = (char*)cp;

      md->off = cp - start;