mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 23:07:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge bitcoin/bitcoin#21905: net: initialize nMessageSize to uint32_t max

Browse source 
9c891b64ff net: initialize nMessageSize to max uint32_t instead of -1 (eugene)

Pull request description:

  nMessageSize is uint32_t and is set to -1. This will warn with `-fsanitize=implicit-integer-sign-change` when V1TransportDeserializer calls into the ctor.  This pull initializes nMessageSize to `numeric_limits<uint32_t>::max()` instead and removes the ubsan suppression.

ACKs for top commit:
  laanwj:
    Code review ACK 9c891b64ff
  promag:
    Code review ACK 9c891b64ff.

Tree-SHA512: f05173d9553a01d207a5a7f8ff113d9e11354c50b494a67d44d3931c151581599a9da4e28f40edd113f4698ea9115e6092b2a5b7329c841426726772076c1493
This commit is contained in:
W. J. van der Laan 2021-05-12 17:20:21 +02:00
commit 6b49d88a5d
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/protocol.cpp
View file

@ -91,7 +91,6 @@ CMessageHeader::CMessageHeader()
{ {
memset(pchMessageStart, 0, MESSAGE_START_SIZE); memset(pchMessageStart, 0, MESSAGE_START_SIZE);
memset(pchCommand, 0, sizeof(pchCommand)); memset(pchCommand, 0, sizeof(pchCommand));
nMessageSize = -1;
memset(pchChecksum, 0, CHECKSUM_SIZE); memset(pchChecksum, 0, CHECKSUM_SIZE);
} }

3
src/protocol.h
View file

@ -16,6 +16,7 @@
#include <uint256.h> #include <uint256.h>
#include <version.h> #include <version.h>
#include <limits>
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
@ -51,7 +52,7 @@ public:
char pchMessageStart[MESSAGE_START_SIZE]; char pchMessageStart[MESSAGE_START_SIZE];
char pchCommand[COMMAND_SIZE]; char pchCommand[COMMAND_SIZE];
uint32_t nMessageSize; uint32_t nMessageSize{std::numeric_limits<uint32_t>::max()};
uint8_t pchChecksum[CHECKSUM_SIZE]; uint8_t pchChecksum[CHECKSUM_SIZE];
}; };

1
test/sanitizer_suppressions/ubsan
View file

@ -62,7 +62,6 @@ implicit-integer-sign-change:key.cpp
implicit-integer-sign-change:noui.cpp implicit-integer-sign-change:noui.cpp
implicit-integer-sign-change:policy/fees.cpp implicit-integer-sign-change:policy/fees.cpp
implicit-integer-sign-change:prevector.h implicit-integer-sign-change:prevector.h
implicit-integer-sign-change:protocol.cpp
implicit-integer-sign-change:script/bitcoinconsensus.cpp implicit-integer-sign-change:script/bitcoinconsensus.cpp
implicit-integer-sign-change:script/interpreter.cpp implicit-integer-sign-change:script/interpreter.cpp
implicit-integer-sign-change:serialize.h implicit-integer-sign-change:serialize.h