mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-25 07:07:52 +01:00
Merge branch 'maint-0.4.5'
This commit is contained in:
commit
efb174df24
2 changed files with 11 additions and 0 deletions
5
changes/ticket40286_minimal
Normal file
5
changes/ticket40286_minimal
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
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.
|
|
@ -497,6 +497,12 @@ dump_desc,(const char *desc, const char *type))
|
||||||
{
|
{
|
||||||
tor_assert(desc);
|
tor_assert(desc);
|
||||||
tor_assert(type);
|
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;
|
size_t len;
|
||||||
/* The SHA256 of the string */
|
/* The SHA256 of the string */
|
||||||
uint8_t digest_sha256[DIGEST256_LEN];
|
uint8_t digest_sha256[DIGEST256_LEN];
|
||||||
|
|
Loading…
Add table
Reference in a new issue