torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'tor-gitlab/mr/605' into maint-0.4.5

Browse Source
This commit is contained in:
David Goulet
2022-07-27 11:33:16 -04:00
parent dc13936f20 8e7bd96362
commit 691e542fd5
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug40645
+5
View File
@@ -0,0 +1,5 @@
o Minor bugfixes (defense in depth):
- Change a test in the netflow padding code to make it more
_obviously_ safe against remotely triggered crashes.
(It was safe against these before, but not obviously so.)
Fixes bug 40645; bugfix on 0.3.1.1-alpha.
src/core/or/channelpadding.c
+1 -1
View File
@@ -186,7 +186,7 @@ channelpadding_get_netflow_inactive_timeout_ms(const channel_t *chan)
high_timeout = MAX(high_timeout, chan->padding_timeout_high_ms);
}
if (low_timeout == high_timeout)
if (low_timeout >= high_timeout)
return low_timeout; // No randomization
/*