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

Merge branch 'bug40286_disable_min_035' into maint-0.3.5

parents 1a0b5fd5 ede88c37
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
  o Major bugfixes (denial of service):
    - Disable the dump_desc() function that we used to dump unparseable
      information to disk. It was called incorrectly in several places,
      in a way that could lead to excessive CPU usage.
      Fixes bug 40286; bugfix on 0.2.2.1-alpha.
+6 −0
Original line number Diff line number Diff line
@@ -492,6 +492,12 @@ dump_desc,(const char *desc, const char *type))
{
  tor_assert(desc);
  tor_assert(type);
#ifndef TOR_UNIT_TESTS
  /* On older versions of Tor we are disabling this function, since it
   * can be called with strings that are far too long. */
  if (1)
    return;
#endif
  size_t len;
  /* The SHA256 of the string */
  uint8_t digest_sha256[DIGEST256_LEN];