summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2021-03-15 08:41:03 -0400
committerNick Mathewson <nickm@torproject.org>2021-03-15 08:41:03 -0400
commitf46f4562cf6f47fe6c00752f61b04dc18a454253 (patch)
treeb447d3b3e2de0a7381762e9f160e2d609e1c1f67 /src
parent1a0b5fd569684fc2d75436f7b3befcc5652c87e1 (diff)
parentede88c374cd61e1e362422718625707a770cffff (diff)
downloadtor-f46f4562cf6f47fe6c00752f61b04dc18a454253.tar.gz
tor-f46f4562cf6f47fe6c00752f61b04dc18a454253.zip
Merge branch 'bug40286_disable_min_035' into maint-0.3.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 941b5a1f6d..a547335452 100644
--- a/src/feature/dirparse/unparseable.c
+++ b/src/feature/dirparse/unparseable.c
@@ -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];