Fix subscript[0] in validation.cpp

JeremyRubin · JeremyRubin · commit 4cac0d1e041d · 2017-07-08T13:33:01.000-07:00
diff --git a/src/serialize.h b/src/serialize.h
@@ -450,15 +450,15 @@ class LimitedString
         }
         string.resize(size);
         if (size != 0)
-            s.read((char*)&string[0], size);
+            s.read((char*)string.data(), size);
     }
 
     template<typename Stream>
     void Serialize(Stream& s) const
     {
         WriteCompactSize(s, string.size());
         if (!string.empty())
-            s.write((char*)&string[0], string.size());
+            s.write((char*)string.data(), string.size());
     }
 };
 
@@ -556,7 +556,7 @@ void Serialize(Stream& os, const std::basic_string<C>& str)
 {
     WriteCompactSize(os, str.size());
     if (!str.empty())
-        os.write((char*)&str[0], str.size() * sizeof(str[0]));
+        os.write((char*)str.data(), str.size() * sizeof(C));
 }
 
 template<typename Stream, typename C>
@@ -565,7 +565,7 @@ void Unserialize(Stream& is, std::basic_string<C>& str)
     unsigned int nSize = ReadCompactSize(is);
     str.resize(nSize);
     if (nSize != 0)
-        is.read((char*)&str[0], nSize * sizeof(str[0]));
+        is.read((char*)str.data(), nSize * sizeof(C));
 }
 
 
@@ -578,7 +578,7 @@ void Serialize_impl(Stream& os, const prevector<N, T>& v, const unsigned char&)
 {
     WriteCompactSize(os, v.size());
     if (!v.empty())
-        os.write((char*)&v[0], v.size() * sizeof(T));
+        os.write((char*)v.data(), v.size() * sizeof(T));
 }
 
 template<typename Stream, unsigned int N, typename T, typename V>
@@ -646,7 +646,7 @@ void Serialize_impl(Stream& os, const std::vector<T, A>& v, const unsigned char&
 {
     WriteCompactSize(os, v.size());
     if (!v.empty())
-        os.write((char*)&v[0], v.size() * sizeof(T));
+        os.write((char*)v.data(), v.size() * sizeof(T));
 }
 
 template<typename Stream, typename T, typename A, typename V>
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2890,7 +2890,7 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc
     if (consensusParams.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {
         if (commitpos == -1) {
             uint256 witnessroot = BlockWitnessMerkleRoot(block, NULL);
-            CHash256().Write(witnessroot.begin(), 32).Write(&ret[0], 32).Finalize(witnessroot.begin());
+            CHash256().Write(witnessroot.begin(), 32).Write(ret.data(), 32).Finalize(witnessroot.begin());
             CTxOut out;
             out.nValue = 0;
             out.scriptPubKey.resize(38);

Original file line number	Diff line number	Diff line change
`@@ -450,15 +450,15 @@ class LimitedString`
`450`	`450`	`}`
`451`	`451`	`string.resize(size);`
`452`	`452`	`if (size != 0)`
`453`		`- s.read((char*)&string[0], size);`
	`453`	`+ s.read((char*)string.data(), size);`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`template<typename Stream>`
`457`	`457`	`void Serialize(Stream& s) const`
`458`	`458`	`{`
`459`	`459`	`WriteCompactSize(s, string.size());`
`460`	`460`	`if (!string.empty())`
`461`		`- s.write((char*)&string[0], string.size());`
	`461`	`+ s.write((char*)string.data(), string.size());`
`462`	`462`	`}`
`463`	`463`	`};`
`464`	`464`
`@@ -556,7 +556,7 @@ void Serialize(Stream& os, const std::basic_string<C>& str)`
`556`	`556`	`{`
`557`	`557`	`WriteCompactSize(os, str.size());`
`558`	`558`	`if (!str.empty())`
`559`		`- os.write((char)&str[0], str.size() sizeof(str[0]));`
	`559`	`+ os.write((char)str.data(), str.size() sizeof(C));`
`560`	`560`	`}`
`561`	`561`
`562`	`562`	`template<typename Stream, typename C>`
`@@ -565,7 +565,7 @@ void Unserialize(Stream& is, std::basic_string<C>& str)`
`565`	`565`	`unsigned int nSize = ReadCompactSize(is);`
`566`	`566`	`str.resize(nSize);`
`567`	`567`	`if (nSize != 0)`
`568`		`- is.read((char)&str[0], nSize sizeof(str[0]));`
	`568`	`+ is.read((char)str.data(), nSize sizeof(C));`
`569`	`569`	`}`
`570`	`570`
`571`	`571`
`@@ -578,7 +578,7 @@ void Serialize_impl(Stream& os, const prevector<N, T>& v, const unsigned char&)`
`578`	`578`	`{`
`579`	`579`	`WriteCompactSize(os, v.size());`
`580`	`580`	`if (!v.empty())`
`581`		`- os.write((char)&v[0], v.size() sizeof(T));`
	`581`	`+ os.write((char)v.data(), v.size() sizeof(T));`
`582`	`582`	`}`
`583`	`583`
`584`	`584`	`template<typename Stream, unsigned int N, typename T, typename V>`
`@@ -646,7 +646,7 @@ void Serialize_impl(Stream& os, const std::vector<T, A>& v, const unsigned char&`
`646`	`646`	`{`
`647`	`647`	`WriteCompactSize(os, v.size());`
`648`	`648`	`if (!v.empty())`
`649`		`- os.write((char)&v[0], v.size() sizeof(T));`
	`649`	`+ os.write((char)v.data(), v.size() sizeof(T));`
`650`	`650`	`}`
`651`	`651`
`652`	`652`	`template<typename Stream, typename T, typename A, typename V>`