lukechilds
/
miniscript
mirror of https://github.com/lukechilds/miniscript.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Avoid unsigned underflow

master
Pieter Wuille 5 years ago
parent
3be60b5cff
commit
f38970ce72
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      bitcoin/script/miniscript.h

4
bitcoin/script/miniscript.h
View File

@ -493,7 +493,7 @@ private:
for (const auto& sub : subs) { for (const auto& sub : subs) {
stat += sub->ops.stat + 1; stat += sub->ops.stat + 1;
dsat += sub->ops.dsat.value; // The type system requires "d" for thresh, so dsat must always be valid. dsat += sub->ops.dsat.value; // The type system requires "d" for thresh, so dsat must always be valid.
if (sub->ops.sat.valid) diffs.push_back((int32_t)sub->ops.sat.value - sub->ops.dsat.value); if (sub->ops.sat.valid) diffs.push_back((int32_t)sub->ops.sat.value - (int32_t)sub->ops.dsat.value);
} }
if (diffs.size() < k) return {stat, {}, dsat}; if (diffs.size() < k) return {stat, {}, dsat};
std::sort(diffs.begin(), diffs.end()); std::sort(diffs.begin(), diffs.end());
@ -538,7 +538,7 @@ private:
std::vector<int32_t> diffs; std::vector<int32_t> diffs;
for (const auto& sub : subs) { for (const auto& sub : subs) {
dsat += sub->ss.dsat.value; // The type system requires "d" for thresh, so dsat must always be valid. dsat += sub->ss.dsat.value; // The type system requires "d" for thresh, so dsat must always be valid.
if (sub->ss.sat.valid) diffs.push_back((int32_t)sub->ss.sat.value - sub->ss.dsat.value); if (sub->ss.sat.valid) diffs.push_back((int32_t)sub->ss.sat.value - (int32_t)sub->ss.dsat.value);
} }
if (diffs.size() < k) return {{}, dsat}; if (diffs.size() < k) return {{}, dsat};
std::sort(diffs.begin(), diffs.end()); std::sort(diffs.begin(), diffs.end());

Write Preview
Loading…
Cancel
Save