Avoid dereference-of-casted-pointer

sipa · sipa · commit 0aadc11fd88b · 2017-07-07T10:45:31.000-07:00
diff --git a/src/core_memusage.h b/src/core_memusage.h
@@ -10,7 +10,7 @@
 #include "memusage.h"
 
 static inline size_t RecursiveDynamicUsage(const CScript& script) {
-    return memusage::DynamicUsage(*static_cast<const CScriptBase*>(&script));
+    return memusage::DynamicUsage(script);
 }
 
 static inline size_t RecursiveDynamicUsage(const COutPoint& out) {
diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h
@@ -107,7 +107,7 @@ class CTxIn
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(prevout);
-        READWRITE(*(CScriptBase*)(&scriptSig));
+        READWRITE(scriptSig);
         READWRITE(nSequence);
     }
 
@@ -147,7 +147,7 @@ class CTxOut
     template <typename Stream, typename Operation>
     inline void SerializationOp(Stream& s, Operation ser_action) {
         READWRITE(nValue);
-        READWRITE(*(CScriptBase*)(&scriptPubKey));
+        READWRITE(scriptPubKey);
     }
 
     void SetNull()
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -798,7 +798,7 @@ static void ApplyStats(CCoinsStats &stats, CHashWriter& ss, const uint256& hash,
     stats.nTransactions++;
     for (const auto output : outputs) {
         ss << VARINT(output.first + 1);
-        ss << *(const CScriptBase*)(&output.second.out.scriptPubKey);
+        ss << output.second.out.scriptPubKey;
         ss << VARINT(output.second.out.nValue);
         stats.nTransactionOutputs++;
         stats.nTotalAmount += output.second.out.nValue;
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
@@ -1099,7 +1099,7 @@ class CTransactionSignatureSerializer {
         // Serialize the script
         if (nInput != nIn)
             // Blank out other inputs' signatures
-            ::Serialize(s, CScriptBase());
+            ::Serialize(s, CScript());
         else
             SerializeScriptCode(s);
         // Serialize the nSequence
@@ -1207,7 +1207,7 @@ uint256 SignatureHash(const CScript& scriptCode, const CTransaction& txTo, unsig
         // The prevout may already be contained in hashPrevout, and the nSequence
         // may already be contain in hashSequence.
         ss << txTo.vin[nIn].prevout;
-        ss << static_cast<const CScriptBase&>(scriptCode);
+        ss << scriptCode;
         ss << amount;
         ss << txTo.vin[nIn].nSequence;
         // Outputs (none/one/all, depending on flags)
diff --git a/src/script/script.h b/src/script/script.h
@@ -8,6 +8,7 @@
 
 #include "crypto/common.h"
 #include "prevector.h"
+#include "serialize.h"
 
 #include <assert.h>
 #include <climits>
@@ -404,6 +405,13 @@ class CScript : public CScriptBase
     CScript(std::vector<unsigned char>::const_iterator pbegin, std::vector<unsigned char>::const_iterator pend) : CScriptBase(pbegin, pend) { }
     CScript(const unsigned char* pbegin, const unsigned char* pend) : CScriptBase(pbegin, pend) { }
 
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action) {
+        READWRITE(static_cast<CScriptBase&>(*this));
+    }
+
     CScript& operator+=(const CScript& b)
     {
         insert(end(), b.begin(), b.end());
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
@@ -95,7 +95,7 @@ BOOST_AUTO_TEST_CASE(dbwrapper_iterator)
         uint256 in2 = InsecureRand256();
         BOOST_CHECK(dbw.Write(key2, in2));
 
-        std::unique_ptr<CDBIterator> it(const_cast<CDBWrapper*>(&dbw)->NewIterator());
+        std::unique_ptr<CDBIterator> it(const_cast<CDBWrapper&>(dbw).NewIterator());
 
         // Be sure to seek past the obfuscation key (if it exists)
         it->Seek(key);
@@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE(iterator_ordering)
         BOOST_CHECK(dbw.Write(key, value));
     }
 
-    std::unique_ptr<CDBIterator> it(const_cast<CDBWrapper*>(&dbw)->NewIterator());
+    std::unique_ptr<CDBIterator> it(const_cast<CDBWrapper&>(dbw).NewIterator());
     for (int c=0; c<2; ++c) {
         int seek_start;
         if (c == 0)
@@ -286,7 +286,7 @@ BOOST_AUTO_TEST_CASE(iterator_string_ordering)
         }
     }
 
-    std::unique_ptr<CDBIterator> it(const_cast<CDBWrapper*>(&dbw)->NewIterator());
+    std::unique_ptr<CDBIterator> it(const_cast<CDBWrapper&>(dbw).NewIterator());
     for (int c=0; c<2; ++c) {
         int seek_start;
         if (c == 0)
diff --git a/src/txdb.cpp b/src/txdb.cpp
@@ -172,7 +172,7 @@ bool CBlockTreeDB::ReadLastBlockFile(int &nFile) {
 
 CCoinsViewCursor *CCoinsViewDB::Cursor() const
 {
-    CCoinsViewDBCursor *i = new CCoinsViewDBCursor(const_cast<CDBWrapper*>(&db)->NewIterator(), GetBestBlock());
+    CCoinsViewDBCursor *i = new CCoinsViewDBCursor(const_cast<CDBWrapper&>(db).NewIterator(), GetBestBlock());
     /* It seems that there are no "const iterators" for LevelDB.  Since we
        only need read operations on it, use a const-cast to get around
        that restriction.  */
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -94,23 +94,23 @@ bool CWalletDB::WriteMasterKey(unsigned int nID, const CMasterKey& kMasterKey)
 
 bool CWalletDB::WriteCScript(const uint160& hash, const CScript& redeemScript)
 {
-    return WriteIC(std::make_pair(std::string("cscript"), hash), *(const CScriptBase*)(&redeemScript), false);
+    return WriteIC(std::make_pair(std::string("cscript"), hash), redeemScript, false);
 }
 
 bool CWalletDB::WriteWatchOnly(const CScript &dest, const CKeyMetadata& keyMeta)
 {
-    if (!WriteIC(std::make_pair(std::string("watchmeta"), *(const CScriptBase*)(&dest)), keyMeta)) {
+    if (!WriteIC(std::make_pair(std::string("watchmeta"), dest), keyMeta)) {
         return false;
     }
-    return WriteIC(std::make_pair(std::string("watchs"), *(const CScriptBase*)(&dest)), '1');
+    return WriteIC(std::make_pair(std::string("watchs"), dest), '1');
 }
 
 bool CWalletDB::EraseWatchOnly(const CScript &dest)
 {
-    if (!EraseIC(std::make_pair(std::string("watchmeta"), *(const CScriptBase*)(&dest)))) {
+    if (!EraseIC(std::make_pair(std::string("watchmeta"), dest))) {
         return false;
     }
-    return EraseIC(std::make_pair(std::string("watchs"), *(const CScriptBase*)(&dest)));
+    return EraseIC(std::make_pair(std::string("watchs"), dest));
 }
 
 bool CWalletDB::WriteBestBlock(const CBlockLocator& locator)
@@ -323,7 +323,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
         {
             wss.nWatchKeys++;
             CScript script;
-            ssKey >> *(CScriptBase*)(&script);
+            ssKey >> script;
             char fYes;
             ssValue >> fYes;
             if (fYes == '1')
@@ -440,7 +440,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             else if (strType == "watchmeta")
             {
               CScript script;
-              ssKey >> *(CScriptBase*)(&script);
+              ssKey >> script;
               keyID = CScriptID(script);
             }
 
@@ -474,7 +474,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             uint160 hash;
             ssKey >> hash;
             CScript script;
-            ssValue >> *(CScriptBase*)(&script);
+            ssValue >> script;
             if (!pwallet->LoadCScript(script))
             {
                 strErr = "Error reading wallet database: LoadCScript failed";

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#include "memusage.h"`
`11`	`11`
`12`	`12`	`static inline size_t RecursiveDynamicUsage(const CScript& script) {`
`13`		`- return memusage::DynamicUsage(static_cast<const CScriptBase>(&script));`
	`13`	`+ return memusage::DynamicUsage(script);`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`static inline size_t RecursiveDynamicUsage(const COutPoint& out) {`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ bool CBlockTreeDB::ReadLastBlockFile(int &nFile) {`
`172`	`172`
`173`	`173`	`CCoinsViewCursor *CCoinsViewDB::Cursor() const`
`174`	`174`	`{`
`175`		`- CCoinsViewDBCursor i = new CCoinsViewDBCursor(const_cast<CDBWrapper>(&db)->NewIterator(), GetBestBlock());`
	`175`	`+ CCoinsViewDBCursor *i = new CCoinsViewDBCursor(const_cast<CDBWrapper&>(db).NewIterator(), GetBestBlock());`
`176`	`176`	`/* It seems that there are no "const iterators" for LevelDB. Since we`
`177`	`177`	`only need read operations on it, use a const-cast to get around`
`178`	`178`	`that restriction. */`
Original file line number	Diff line number	Diff line change
`@@ -94,23 +94,23 @@ bool CWalletDB::WriteMasterKey(unsigned int nID, const CMasterKey& kMasterKey)`
`94`	`94`
`95`	`95`	`bool CWalletDB::WriteCScript(const uint160& hash, const CScript& redeemScript)`
`96`	`96`	`{`
`97`		`- return WriteIC(std::make_pair(std::string("cscript"), hash), (const CScriptBase)(&redeemScript), false);`
	`97`	`+ return WriteIC(std::make_pair(std::string("cscript"), hash), redeemScript, false);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`bool CWalletDB::WriteWatchOnly(const CScript &dest, const CKeyMetadata& keyMeta)`
`101`	`101`	`{`
`102`		`- if (!WriteIC(std::make_pair(std::string("watchmeta"), (const CScriptBase)(&dest)), keyMeta)) {`
	`102`	`+ if (!WriteIC(std::make_pair(std::string("watchmeta"), dest), keyMeta)) {`
`103`	`103`	`return false;`
`104`	`104`	`}`
`105`		`- return WriteIC(std::make_pair(std::string("watchs"), (const CScriptBase)(&dest)), '1');`
	`105`	`+ return WriteIC(std::make_pair(std::string("watchs"), dest), '1');`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`bool CWalletDB::EraseWatchOnly(const CScript &dest)`
`109`	`109`	`{`
`110`		`- if (!EraseIC(std::make_pair(std::string("watchmeta"), (const CScriptBase)(&dest)))) {`
	`110`	`+ if (!EraseIC(std::make_pair(std::string("watchmeta"), dest))) {`
`111`	`111`	`return false;`
`112`	`112`	`}`
`113`		`- return EraseIC(std::make_pair(std::string("watchs"), (const CScriptBase)(&dest)));`
	`113`	`+ return EraseIC(std::make_pair(std::string("watchs"), dest));`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`bool CWalletDB::WriteBestBlock(const CBlockLocator& locator)`
`@@ -323,7 +323,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,`
`323`	`323`	`{`
`324`	`324`	`wss.nWatchKeys++;`
`325`	`325`	`CScript script;`
`326`		`- ssKey >> (CScriptBase)(&script);`
	`326`	`+ ssKey >> script;`
`327`	`327`	`char fYes;`
`328`	`328`	`ssValue >> fYes;`
`329`	`329`	`if (fYes == '1')`
`@@ -440,7 +440,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,`
`440`	`440`	`else if (strType == "watchmeta")`
`441`	`441`	`{`
`442`	`442`	`CScript script;`
`443`		`- ssKey >> (CScriptBase)(&script);`
	`443`	`+ ssKey >> script;`
`444`	`444`	`keyID = CScriptID(script);`
`445`	`445`	`}`
`446`	`446`
`@@ -474,7 +474,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,`
`474`	`474`	`uint160 hash;`
`475`	`475`	`ssKey >> hash;`
`476`	`476`	`CScript script;`
`477`		`- ssValue >> (CScriptBase)(&script);`
	`477`	`+ ssValue >> script;`
`478`	`478`	`if (!pwallet->LoadCScript(script))`
`479`	`479`	`{`
`480`	`480`	`strErr = "Error reading wallet database: LoadCScript failed";`