GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge #221: CSurjectionCheck copies vector instead of swapping

Browse source 
87c1fc2 CSurjectionCheck copies vector instead of swapping (Gregory Sanders)
This commit is contained in:
Gregory Sanders 2017-09-22 11:34:40 -04:00
commit 9a0ff5c7f6
No known key found for this signature in database
GPG key ID: F3F68E2D86A48FDB
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/validation.cpp
View file

@ -611,9 +611,7 @@ private:
secp256k1_generator gen;
const bool store;
public:
CSurjectionCheck(secp256k1_surjectionproof& proofIn, std::vector<secp256k1_generator>& vTags_, secp256k1_generator& genIn, const bool storeIn) : proof(proofIn), gen(genIn), store(storeIn) {
vTags.swap(vTags_);
}
CSurjectionCheck(secp256k1_surjectionproof& proofIn, std::vector<secp256k1_generator>& tags_in, secp256k1_generator& genIn, const bool storeIn) : proof(proofIn), vTags(tags_in), gen(genIn), store(storeIn) {}
bool operator()();
};
@ -961,8 +959,6 @@ bool VerifyAmounts(const CCoinsViewCache& cache, const CTransaction& tx, std::ve
}
}
std::vector<secp256k1_generator> copy_targetGenerators(targetGenerators);
for (size_t i = 0; i < tx.vout.size(); i++)
{
const CConfidentialAsset& asset = tx.vout[i].nAsset;
@ -986,9 +982,6 @@ bool VerifyAmounts(const CCoinsViewCache& cache, const CTransaction& tx, std::ve
if (QueueCheck(pvChecks, new CSurjectionCheck(proof, targetGenerators, gen, cacheStore)) != SCRIPT_ERR_OK) {
return false;
}
// Each CSurjectionCheck uses swap to keep pointers valid.
// Original values need to put back in place for next output
targetGenerators = copy_targetGenerators;
}
return true;