Skip to content

tools: update inspector_protocol to e8ba1a7 #39694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Trott wants to merge 6 commits into from
Closed

tools: update inspector_protocol to e8ba1a7 #39694

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1de3a7
tools: update inspector_protocol to fe0467fd105a
Trott Aug 7, 2021
54e8e4c
tools: update inspector_protocol to a53e96d31a2755eb16ca37
Trott Aug 7, 2021
7adf75d
Revert "tools: fix compiler warning in inspector_protocol"
Trott Aug 7, 2021
ce4d6b2
tools: update inspector_protocol to 97d3146
Trott Aug 7, 2021
c2e1f48
tools: update inspector_protocol to 39ca567
Trott Aug 7, 2021
2b4219d
tools: update inspector_protocol to e8ba1a7
Trott Aug 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tools: update inspector_protocol to a53e96d31a2755eb16ca37 
Refs: https://chromium.googlesource.com/deps/inspector_protocol/+log
  • Loading branch information
@Trott
Trott committed Aug 7, 2021
commit 54e8e4c272dcbc1181ac4121aed21b4cd839fcd3
10 changes: 6 additions & 4 deletions tools/inspector_protocol/encoding/encoding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,10 +846,12 @@ void CBORTokenizer::ReadNextToken(bool enter_envelope) {
// inspector_protocol, it's not a CBOR limitation); in CBOR, the
// negative values for INT32 are represented as NEGATIVE, that is, -1
// INT32 is represented as 1 << 5 | 0 (major type 1, additional info
// value 0). The minimal allowed INT32 value in our protocol is
// std::numeric_limits<int32_t>::min(). We check for it by directly
// checking the payload against the maximal allowed signed (!) int32
// value.
// value 0).
// The represented allowed values range is -1 to -2^31.
// They are mapped into the encoded range of 0 to 2^31-1.
// We check the the payload in token_start_internal_value_ against
// that range (2^31-1 is also known as
// std::numeric_limits<int32_t>::max()).
if (!success || token_start_internal_value_ >
std::numeric_limits<int32_t>::max()) {
SetError(Error::CBOR_INVALID_INT32);
Expand Down
7 changes: 6 additions & 1 deletion tools/inspector_protocol/encoding/encoding_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,9 @@ TEST(EncodeDecodeInt32Test, RoundtripsInt32Max) {
}

TEST(EncodeDecodeInt32Test, RoundtripsInt32Min) {
// std::numeric_limits<int32_t> is encoded as a uint32 after the initial byte.
// std::numeric_limits<int32_t> is encoded as a uint32 (4 unsigned bytes)
// after the initial byte, which effectively carries the sign by
// designating the token as NEGATIVE.
std::vector<uint8_t> encoded;
EncodeInt32(std::numeric_limits<int32_t>::min(), &encoded);
// 1 for initial byte, 4 for the uint32.
Expand All @@ -248,6 +250,9 @@ TEST(EncodeDecodeInt32Test, RoundtripsInt32Min) {
CBORTokenizer tokenizer(SpanFrom(encoded));
EXPECT_EQ(CBORTokenTag::INT32, tokenizer.TokenTag());
EXPECT_EQ(std::numeric_limits<int32_t>::min(), tokenizer.GetInt32());
// It's nice to see how the min int32 value reads in hex:
// That is, -1 minus the unsigned payload (0x7fffffff, see above).
EXPECT_EQ(-0x80000000l, tokenizer.GetInt32());
tokenizer.Next();
EXPECT_EQ(CBORTokenTag::DONE, tokenizer.TokenTag());
}
Expand Down