Skip to content

common: saturate marginal_feerate() instead of overflowing #9365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
morehouse wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −2
Open

common: saturate marginal_feerate() instead of overflowing #9365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions common/fee_states.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,12 @@ u32 marginal_feerate(u32 current_feerate)
/* This could happen in future if we celebrate sub-sat summer! */
if (current_feerate < minfeerate)
current_feerate = minfeerate;
if (current_feerate > maxfeerate)
return current_feerate * 1.1;
if (current_feerate > maxfeerate) {
u64 marginal = ((u64)current_feerate * 11) / 10;
if (marginal > UINT32_MAX)
return UINT32_MAX;
return marginal;
}

/* min gives 1, max gives 0.1 */
double proportion = 1.0 - ((double)current_feerate - minfeerate) / (maxfeerate - minfeerate) * 0.9;
Expand Down
7 changes: 7 additions & 0 deletions common/test/run-marginal_feerate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,5 +127,12 @@ int main(int argc, char *argv[])
u32 half = (45000 + 253)/2;
assert(marginal_feerate(half) == (u32)(half * 1.55));

/* These values straddle the case where adding 10% exceeds UINT32_MAX.
* No overflow should occur. */
assert(marginal_feerate(3904515722) == UINT32_MAX - 1);
assert(marginal_feerate(3904515723) == UINT32_MAX);
assert(marginal_feerate(3904515724) == UINT32_MAX);
assert(marginal_feerate(UINT32_MAX) == UINT32_MAX);

common_shutdown();
}
Loading