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 pull request #1425 from ElementsProject/simplicity

Browse source 
Avoid double free in simplicity pointer when copying PrecomputedTrans…
This commit is contained in:
Byron Hambly 2025-03-04 14:53:57 +02:00 • committed by GitHub
commit 0eb2ea5cbe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/script/interpreter.cpp
View file

@ -2669,7 +2669,7 @@ void PrecomputedTransactionData::Init(const T& txTo, std::vector<CTxOut>&& spent
simplicityRawTx.version = txTo.nVersion; simplicityRawTx.version = txTo.nVersion;
simplicityRawTx.lockTime = txTo.nLockTime; simplicityRawTx.lockTime = txTo.nLockTime;
m_simplicity_tx_data = simplicity_elements_mallocTransaction(&simplicityRawTx); m_simplicity_tx_data = SimplicityTransactionUniquePtr(simplicity_elements_mallocTransaction(&simplicityRawTx));
m_bip341_taproot_ready = true; m_bip341_taproot_ready = true;
} }
@ -3121,7 +3121,7 @@ bool GenericTransactionSignatureChecker<T>::CheckSimplicity(const valtype& progr
assert(txdata->m_simplicity_tx_data); assert(txdata->m_simplicity_tx_data);
assert(simplicityTapEnv); assert(simplicityTapEnv);
if (!simplicity_elements_execSimplicity(&error, 0, txdata->m_simplicity_tx_data, nIn, simplicityTapEnv, txdata->m_hash_genesis_block.data(), budget, 0, program.data(), program.size(), witness.data(), witness.size())) { if (!simplicity_elements_execSimplicity(&error, 0, txdata->m_simplicity_tx_data.get(), nIn, simplicityTapEnv, txdata->m_hash_genesis_block.data(), budget, 0, program.data(), program.size(), witness.data(), witness.size())) {
assert(!"simplicity_elements_execSimplicity internal error"); assert(!"simplicity_elements_execSimplicity internal error");
} }
simplicity_elements_freeTapEnv(simplicityTapEnv); simplicity_elements_freeTapEnv(simplicityTapEnv);

14
src/script/interpreter.h
View file

@ -169,9 +169,18 @@ enum : uint32_t {
bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror); bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror);
struct SimplicityTransactionDeleter
{
void operator()(transaction* ptr)
{
simplicity_elements_freeTransaction(ptr);
}
};
using SimplicityTransactionUniquePtr = std::unique_ptr<transaction, SimplicityTransactionDeleter>;
struct PrecomputedTransactionData struct PrecomputedTransactionData
{ {
transaction* m_simplicity_tx_data = nullptr; SimplicityTransactionUniquePtr m_simplicity_tx_data;
// BIP341 precomputed data. // BIP341 precomputed data.
// These are single-SHA256, see https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki#cite_note-15. // These are single-SHA256, see https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki#cite_note-15.
uint256 m_prevouts_single_hash; uint256 m_prevouts_single_hash;
@ -221,9 +230,6 @@ struct PrecomputedTransactionData
template <class T> template <class T>
explicit PrecomputedTransactionData(const T& tx); explicit PrecomputedTransactionData(const T& tx);
~PrecomputedTransactionData() {
simplicity_elements_freeTransaction(m_simplicity_tx_data);
}
}; };
enum class SigVersion enum class SigVersion

4
src/test/fuzz/simplicity.cpp
View file

@ -204,13 +204,13 @@ FUZZ_TARGET_INIT(simplicity, initialize_simplicity)
PrecomputedTransactionData txdata{GENESIS_HASH}; PrecomputedTransactionData txdata{GENESIS_HASH};
std::vector<CTxOut> spent_outs_copy{spent_outs}; std::vector<CTxOut> spent_outs_copy{spent_outs};
txdata.Init(mtx, std::move(spent_outs_copy)); txdata.Init(mtx, std::move(spent_outs_copy));
assert(txdata.m_simplicity_tx_data != NULL); assert(txdata.m_simplicity_tx_data);
// 4. Main test // 4. Main test
unsigned char imr_out[32]; unsigned char imr_out[32];
unsigned char *imr = mtx.vin[0].prevout.hash.data()[2] & 2 ? imr_out : NULL; unsigned char *imr = mtx.vin[0].prevout.hash.data()[2] & 2 ? imr_out : NULL;
const transaction* tx = txdata.m_simplicity_tx_data; const transaction* tx = txdata.m_simplicity_tx_data.get();
tapEnv* taproot = simplicity_elements_mallocTapEnv(&simplicityRawTap); tapEnv* taproot = simplicity_elements_mallocTapEnv(&simplicityRawTap);
simplicity_elements_execSimplicity(&error, imr, tx, nIn, taproot, GENESIS_HASH.data(), budget, amr, prog_bytes.data(), prog_bytes.size(), wit_bytes.data(), wit_bytes.size()); simplicity_elements_execSimplicity(&error, imr, tx, nIn, taproot, GENESIS_HASH.data(), budget, amr, prog_bytes.data(), prog_bytes.size(), wit_bytes.data(), wit_bytes.size());

2
src/test/fuzz/simplicity_tx.cpp
View file

@ -217,7 +217,7 @@ FUZZ_TARGET_INIT(simplicity_tx, initialize_simplicity_tx)
// that we will allocate Simplicity data. The check for whether to do this is very // that we will allocate Simplicity data. The check for whether to do this is very
// lax: is this a 34-byte scriptPubKey that starts with OP_1 and does it have a // lax: is this a 34-byte scriptPubKey that starts with OP_1 and does it have a
// nonempty witness. // nonempty witness.
assert(txdata.m_simplicity_tx_data != NULL); assert(txdata.m_simplicity_tx_data);
} }
const CTransaction tx{mtx}; const CTransaction tx{mtx};