Merge #10735: Avoid static analyzer warnings regarding uninitialized arguments
6835cb0ab
Avoid static analyzer warnings regarding uninitialized arguments (practicalswift)
Pull request description:
Avoid static analyzer warnings regarding _"Function call argument is a pointer to uninitialized value"_ in cases where we are intentionally using such arguments.
This is achieved by using `f(b.begin(), b.end())` (`std::array<char, N>`) instead of `f(b, b + N)` (`char b[N]`).
Rationale:
* Reduce false positives by guiding static analyzers regarding our intentions.
Before this commit:
```shell
$ clang-tidy-3.5 -checks=* src/bench/base58.cpp
bench/base58.cpp:23:9: warning: Function call argument is a pointer to uninitialized value [clang-analyzer-core.CallAndMessage]
EncodeBase58(b, b + 32);
^
$ clang-tidy-3.5 -checks=* src/bench/verify_script.cpp
bench/verify_script.cpp:59:5: warning: Function call argument is a pointer to uninitialized value [clang-analyzer-core.CallAndMessage]
key.Set(vchKey, vchKey + 32, false);
^
$
```
After this commit:
```shell
$ clang-tidy-3.5 -checks=* src/bench/base58.cpp
$ clang-tidy-3.5 -checks=* src/bench/verify_script.cpp
$
```
Tree-SHA512: 5814a320ca8b959d0954bb64393424bcad73f942d2e988de1cd6788f39153b93900325532f2e340de02d740a3953385d212ae08e7ec72bb4c394a40475f251df
This commit is contained in:
commit
565494619d
2 changed files with 23 additions and 14 deletions
|
@ -7,34 +7,37 @@
|
||||||
#include "validation.h"
|
#include "validation.h"
|
||||||
#include "base58.h"
|
#include "base58.h"
|
||||||
|
|
||||||
|
#include <array>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
|
||||||
static void Base58Encode(benchmark::State& state)
|
static void Base58Encode(benchmark::State& state)
|
||||||
{
|
{
|
||||||
unsigned char buff[32] = {
|
static const std::array<unsigned char, 32> buff = {
|
||||||
17, 79, 8, 99, 150, 189, 208, 162, 22, 23, 203, 163, 36, 58, 147,
|
{
|
||||||
227, 139, 2, 215, 100, 91, 38, 11, 141, 253, 40, 117, 21, 16, 90,
|
17, 79, 8, 99, 150, 189, 208, 162, 22, 23, 203, 163, 36, 58, 147,
|
||||||
200, 24
|
227, 139, 2, 215, 100, 91, 38, 11, 141, 253, 40, 117, 21, 16, 90,
|
||||||
|
200, 24
|
||||||
|
}
|
||||||
};
|
};
|
||||||
unsigned char* b = buff;
|
|
||||||
while (state.KeepRunning()) {
|
while (state.KeepRunning()) {
|
||||||
EncodeBase58(b, b + 32);
|
EncodeBase58(buff.begin(), buff.end());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void Base58CheckEncode(benchmark::State& state)
|
static void Base58CheckEncode(benchmark::State& state)
|
||||||
{
|
{
|
||||||
unsigned char buff[32] = {
|
static const std::array<unsigned char, 32> buff = {
|
||||||
17, 79, 8, 99, 150, 189, 208, 162, 22, 23, 203, 163, 36, 58, 147,
|
{
|
||||||
227, 139, 2, 215, 100, 91, 38, 11, 141, 253, 40, 117, 21, 16, 90,
|
17, 79, 8, 99, 150, 189, 208, 162, 22, 23, 203, 163, 36, 58, 147,
|
||||||
200, 24
|
227, 139, 2, 215, 100, 91, 38, 11, 141, 253, 40, 117, 21, 16, 90,
|
||||||
|
200, 24
|
||||||
|
}
|
||||||
};
|
};
|
||||||
unsigned char* b = buff;
|
|
||||||
std::vector<unsigned char> vch;
|
std::vector<unsigned char> vch;
|
||||||
vch.assign(b, b + 32);
|
vch.assign(buff.begin(), buff.end());
|
||||||
while (state.KeepRunning()) {
|
while (state.KeepRunning()) {
|
||||||
EncodeBase58Check(vch);
|
EncodeBase58Check(vch);
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,8 @@
|
||||||
#include "script/sign.h"
|
#include "script/sign.h"
|
||||||
#include "streams.h"
|
#include "streams.h"
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
|
||||||
// FIXME: Dedup with BuildCreditingTransaction in test/script_tests.cpp.
|
// FIXME: Dedup with BuildCreditingTransaction in test/script_tests.cpp.
|
||||||
static CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey)
|
static CMutableTransaction BuildCreditingTransaction(const CScript& scriptPubKey)
|
||||||
{
|
{
|
||||||
|
@ -55,8 +57,12 @@ static void VerifyScriptBench(benchmark::State& state)
|
||||||
|
|
||||||
// Keypair.
|
// Keypair.
|
||||||
CKey key;
|
CKey key;
|
||||||
const unsigned char vchKey[32] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
|
static const std::array<unsigned char, 32> vchKey = {
|
||||||
key.Set(vchKey, vchKey + 32, false);
|
{
|
||||||
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
|
||||||
|
}
|
||||||
|
};
|
||||||
|
key.Set(vchKey.begin(), vchKey.end(), false);
|
||||||
CPubKey pubkey = key.GetPubKey();
|
CPubKey pubkey = key.GetPubKey();
|
||||||
uint160 pubkeyHash;
|
uint160 pubkeyHash;
|
||||||
CHash160().Write(pubkey.begin(), pubkey.size()).Finalize(pubkeyHash.begin());
|
CHash160().Write(pubkey.begin(), pubkey.size()).Finalize(pubkeyHash.begin());
|
||||||
|
|
Loading…
Reference in a new issue