summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2021-03-15 08:52:53 -0400
committerNick Mathewson <nickm@torproject.org>2021-03-15 08:52:53 -0400
commitefb174df242adf964e383381d31b891c5f535f1f (patch)
tree9f77cfeee58f40fcc9f6fda927234589d1b5b799 /src
parent8e4965aa36d77aabb47b55eed69d7b9e23bef5d1 (diff)
parent7c5a67ccd983bb028d21a5e8aa48b4cd9d6a8a1c (diff)
downloadtor-efb174df242adf964e383381d31b891c5f535f1f.tar.gz
tor-efb174df242adf964e383381d31b891c5f535f1f.zip
Merge branch 'maint-0.4.5'
Diffstat (limited to 'src')
-rw-r--r--src/feature/dirparse/unparseable.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/feature/dirparse/unparseable.c b/src/feature/dirparse/unparseable.c
index 548ca7dbd6..9098bfa4e0 100644
--- a/src/feature/dirparse/unparseable.c
+++ b/src/feature/dirparse/unparseable.c
@@ -497,6 +497,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];