diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-09-30 12:27:27 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-02-06 13:24:40 +0100 |
| commit | b837b334db5dd6232725fd2350928ff4fbd3feee (patch) | |
| tree | a20d984e931bae8b2a7272977056743b25b19d3e /src/protocol.h | |
| parent | 8a56f79d491271120abc3843c46e9dda44edd308 (diff) | |
| download | bitcoin-b837b334db5dd6232725fd2350928ff4fbd3feee.tar.xz | |
net: Fail instead of truncate command name in CMessageHeader
Replace the memset/strncpy dance in `CMessageHeader::CMessageHeader`
with explicit code that copies then name and asserts the length.
This removes a warning in g++ 9.1.1 and IMO makes the code more readable
by not relying on strncpy padding and silent truncation behavior.
Diffstat (limited to 'src/protocol.h')
| -rw-r--r-- | src/protocol.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/protocol.h b/src/protocol.h index db07efb9f9..6639ae2aac 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -37,6 +37,10 @@ public: typedef unsigned char MessageStartChars[MESSAGE_START_SIZE]; explicit CMessageHeader(const MessageStartChars& pchMessageStartIn); + + /** Construct a P2P message header from message-start characters, a command and the size of the message. + * @note Passing in a `pszCommand` longer than COMMAND_SIZE will result in a run-time assertion error. + */ CMessageHeader(const MessageStartChars& pchMessageStartIn, const char* pszCommand, unsigned int nMessageSizeIn); std::string GetCommand() const; |