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

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
Next Next commit
tools: update inspector_protocol to fe0467fd105a 
Refs: https://chromium.googlesource.com/deps/inspector_protocol/+log
  • Loading branch information
@Trott
Trott committed Aug 7, 2021
commit c1de3a70039372ed534fd980bdda087f5812ada4
21 changes: 11 additions & 10 deletions tools/inspector_protocol/lib/encoding_cpp.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,14 +850,15 @@ void CBORTokenizer::ReadNextToken(bool enter_envelope) {
return;
case MajorType::NEGATIVE: { // INT32.
// INT32 is a signed int32 (int32 makes sense for the
// 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). So here, we compute the INT32 value
// and then check it against the INT32 min.
int64_t actual_value =
-static_cast<int64_t>(token_start_internal_value_) - 1;
if (!success || actual_value < std::numeric_limits<int32_t>::min()) {
// 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.
if (!success || token_start_internal_value_ >
std::numeric_limits<int32_t>::max()) {
SetError(Error::CBOR_INVALID_INT32);
return;
}
Expand Down Expand Up @@ -1864,7 +1865,7 @@ class JsonParser {
// If the |Char| we're dealing with is really a byte, then
// we have utf8 here, and we need to check for multibyte characters
// and transcode them to utf16 (either one or two utf16 chars).
if (sizeof(Char) == sizeof(uint8_t) && c >= 0x7f) {
if (sizeof(Char) == sizeof(uint8_t) && c > 0x7f) {
// Inspect the leading byte to figure out how long the utf8
// byte sequence is; while doing this initialize |codepoint|
// with the first few bits.
Expand Down Expand Up @@ -1903,7 +1904,7 @@ class JsonParser {
// Disallow overlong encodings for ascii characters, as these
// would include " and other characters significant to JSON
// string termination / control.
if (codepoint < 0x7f)
if (codepoint <= 0x7f)
return false;
// Invalid in UTF8, and can't be represented in UTF16 anyway.
if (codepoint > 0x10ffff)
Expand Down