Add assertions: Raise assertion failure instead of doing an out-of-bounds read in case of k > sats.size()

sanket1729 · practicalswift · sanket1729 · commit a47dcc61b875 · 2021-08-04T17:49:20.000-07:00
Co-authored-by: practicalswift &lt;practicalswift@users.noreply.github.com&gt;
diff --git a/bitcoin/script/miniscript.h b/bitcoin/script/miniscript.h
@@ -519,6 +519,7 @@ struct Node {
                     next_sats.push_back(sats[sats.size() - 1] + sub->ops.sat);
                     sats = std::move(next_sats);
                 }
+                assert(k <= sats.size());
                 return {stat, sats[k], sats[0]};
             }
         }
@@ -561,6 +562,7 @@ struct Node {
                     next_sats.push_back(sats[sats.size() - 1] + sub->ss.sat);
                     sats = std::move(next_sats);
                 }
+                assert(k <= sats.size());
                 return {sats[k], sats[0]};
             }
         }
@@ -627,6 +629,7 @@ struct Node {
                 }
                 InputStack nsat = ZERO;
                 for (size_t i = 0; i < k; ++i) nsat = std::move(nsat) + ZERO;
+                assert(k <= sats.size());
                 return InputResult(std::move(nsat), std::move(sats[k]));
             }
             case NodeType::THRESH: {
@@ -643,6 +646,7 @@ struct Node {
                 for (size_t i = 0; i < sats.size(); ++i) {
                     if (i != k) nsat = Choose(std::move(nsat), std::move(sats[i]), nonmal);
                 }
+                assert(k <= sats.size());
                 return InputResult(std::move(nsat), std::move(sats[k]));
             }
             case NodeType::OLDER: {

Original file line number	Diff line number	Diff line change
`@@ -519,6 +519,7 @@ struct Node {`
`519`	`519`	`next_sats.push_back(sats[sats.size() - 1] + sub->ops.sat);`
`520`	`520`	`sats = std::move(next_sats);`
`521`	`521`	`}`
	`522`	`+ assert(k <= sats.size());`
`522`	`523`	`return {stat, sats[k], sats[0]};`
`523`	`524`	`}`
`524`	`525`	`}`
`@@ -561,6 +562,7 @@ struct Node {`
`561`	`562`	`next_sats.push_back(sats[sats.size() - 1] + sub->ss.sat);`
`562`	`563`	`sats = std::move(next_sats);`
`563`	`564`	`}`
	`565`	`+ assert(k <= sats.size());`
`564`	`566`	`return {sats[k], sats[0]};`
`565`	`567`	`}`
`566`	`568`	`}`
`@@ -627,6 +629,7 @@ struct Node {`
`627`	`629`	`}`
`628`	`630`	`InputStack nsat = ZERO;`
`629`	`631`	`for (size_t i = 0; i < k; ++i) nsat = std::move(nsat) + ZERO;`
	`632`	`+ assert(k <= sats.size());`
`630`	`633`	`return InputResult(std::move(nsat), std::move(sats[k]));`
`631`	`634`	`}`
`632`	`635`	`case NodeType::THRESH: {`
`@@ -643,6 +646,7 @@ struct Node {`
`643`	`646`	`for (size_t i = 0; i < sats.size(); ++i) {`
`644`	`647`	`if (i != k) nsat = Choose(std::move(nsat), std::move(sats[i]), nonmal);`
`645`	`648`	`}`
	`649`	`+ assert(k <= sats.size());`
`646`	`650`	`return InputResult(std::move(nsat), std::move(sats[k]));`
`647`	`651`	`}`
`648`	`652`	`case NodeType::OLDER: {`