Merge 99c2ee7 into merged_master (Elements PR ElementsProject#1399)

delta1 · Feb 12, 2025 · 1ba6aee · 1ba6aee
2 parents 20dcf54 + 99c2ee7
commit 1ba6aee
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/chain.h b/src/chain.h
@@ -469,7 +469,7 @@ class CDiskBlockIndex : public CBlockIndex
     bool RemoveDynaFedMaskOnSerialize(bool for_read) {
         if (for_read) {
             bool is_dyna = nVersion < 0;
-            nVersion = ~CBlockHeader::DYNAFED_HF_MASK & nVersion;
+            nVersion = (int32_t) (~CBlockHeader::DYNAFED_HF_MASK & (uint32_t)nVersion);
             return is_dyna;
         } else {
             return is_dynafed_block();

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -1305,6 +1305,10 @@ static RPCHelpMan getcompactsketch()
     CDataStream ssBlock(block_bytes, SER_NETWORK, PROTOCOL_VERSION);
     ssBlock >> block;
 
+    if (block.vtx.empty()) {
+        throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Cannot obtain sketch of empty block.");
+    }
+
     CBlockHeaderAndShortTxIDs cmpctblock(block);
 
     CDataStream ssCompactBlock(SER_NETWORK, PROTOCOL_VERSION);

diff --git a/src/test/fuzz/witness_program.cpp b/src/test/fuzz/witness_program.cpp
@@ -45,7 +45,7 @@ FUZZ_TARGET_INIT(witness_program, initialize_witness_program)
 
         CScriptWitness witness;
         int fuzz_control;
-        int flags;
+        unsigned flags;
         ds >> fuzz_control;
         ds >> witness.stack;
         ds >> flags;
@@ -64,7 +64,7 @@ FUZZ_TARGET_INIT(witness_program, initialize_witness_program)
 
         if (fuzz_control & 1) {
             unsigned char hash_program[32];
-            CSHA256().Write(&program[0], program.size()).Finalize(hash_program);
+            CSHA256().Write(program.data(), program.size()).Finalize(hash_program);
             CScript scriptPubKey = CScript{} << OP_0 << std::vector<unsigned char>(hash_program, hash_program + sizeof(hash_program));
             witness.stack.push_back(program);
 

diff --git a/test/sanitizer_suppressions/ubsan b/test/sanitizer_suppressions/ubsan
@@ -80,3 +80,5 @@ implicit-integer-sign-change:primitives/confidential.cpp
 implicit-integer-sign-change:primitives/confidential.h
 shift-base:simplicity/sha256.c
 unsigned-integer-overflow:simplicity/sha256.c
+# See comment in simplicity/primitive/elements/env.c line 303
+unsigned-integer-overflow:simplicity/primitive/elements/env.c