Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
orbea
Tor
Commits
b9f65390
Commit
b9f65390
authored
4 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Plain Diff
Merge branch 'maint-0.3.5' into maint-0.4.4
parents
fb2c889a
f46f4562
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changes/ticket40286_minimal
+5
-0
5 additions, 0 deletions
changes/ticket40286_minimal
src/feature/dirparse/unparseable.c
+6
-0
6 additions, 0 deletions
src/feature/dirparse/unparseable.c
with
11 additions
and
0 deletions
changes/ticket40286_minimal
0 → 100644
+
5
−
0
View file @
b9f65390
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.
This diff is collapsed.
Click to expand it.
src/feature/dirparse/unparseable.c
+
6
−
0
View file @
b9f65390
...
...
@@ -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
];
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment