Skip to content
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

tools: fix inspector_protocol compiler warnings #39725

Closed
wants to merge 3 commits into from
Closed

tools: fix inspector_protocol compiler warnings #39725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c2c34a
tools: cherry-pick ffb34b6d5dbf0
RaisinTen Mar 2, 2021
e79973c
tools: fix more build warnings in inspector_protocol
richardlau Aug 10, 2021
44104c6
build: run coverage for inspector protocol changes
richardlau Aug 10, 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
2 changes: 0 additions & 2 deletions .github/workflows/coverage-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
- 'benchmark/**'
- 'deps/**'
- 'doc/**'
- 'tools/**'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that's why this was missed in the PR!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have never used it myself, but based on https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#example-using-positive-and-negative-patterns-1, perhaps this would be better?

Suggested change
- 'tools/**'
paths:
- '!**.md'
- '!benchmark/**'
- '!deps/**'
- '!doc/**'
- '!tools/**'
- 'tools/inspector_protocol/**'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, that was supposed to be a suggestion to replace all of lines 6-11, not just line 11.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe do this separately? I'm not sure without testing, for example, if the suggestion would include stuff under src/**, lib/**, etc. and as the GitHub docs mention the ordering matters.

push:
branches:
- master
Expand All @@ -18,7 +17,6 @@ on:
- 'benchmark/**'
- 'deps/**'
- 'doc/**'
- 'tools/**'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here as prior suggestion to use paths: instead of paths-ignore and use ! to negate each path, and then explicitly add tools/inspector_protocol/**.


env:
PYTHON_VERSION: 3.9
Expand Down
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 @@ -831,8 +831,9 @@ void CBORTokenizer::ReadNextToken(bool enter_envelope) {
// inspector_protocol, it's not a CBOR limitation), so we check
// against the signed max, so that the allowable values are
// 0, 1, 2, ... 2^31 - 1.
if (!bytes_read || std::numeric_limits<int32_t>::max() <
token_start_internal_value_) {
if (!bytes_read ||
static_cast<int64_t>(std::numeric_limits<int32_t>::max()) <
static_cast<int64_t>(token_start_internal_value_)) {
SetError(Error::CBOR_INVALID_INT32);
return;
}
Expand All @@ -849,8 +850,9 @@ void CBORTokenizer::ReadNextToken(bool enter_envelope) {
// 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 (!bytes_read || token_start_internal_value_ >
std::numeric_limits<int32_t>::max()) {
if (!bytes_read ||
static_cast<int64_t>(token_start_internal_value_) >
static_cast<int64_t>(std::numeric_limits<int32_t>::max())) {
SetError(Error::CBOR_INVALID_INT32);
return;
}
Expand Down
10 changes: 6 additions & 4 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 @@ -839,8 +839,9 @@ void CBORTokenizer::ReadNextToken(bool enter_envelope) {
// inspector_protocol, it's not a CBOR limitation), so we check
// against the signed max, so that the allowable values are
// 0, 1, 2, ... 2^31 - 1.
if (!bytes_read || std::numeric_limits<int32_t>::max() <
token_start_internal_value_) {
if (!bytes_read ||
static_cast<int64_t>(std::numeric_limits<int32_t>::max()) <
static_cast<int64_t>(token_start_internal_value_)) {
SetError(Error::CBOR_INVALID_INT32);
return;
}
Expand All @@ -857,8 +858,9 @@ void CBORTokenizer::ReadNextToken(bool enter_envelope) {
// 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 (!bytes_read || token_start_internal_value_ >
std::numeric_limits<int32_t>::max()) {
if (!bytes_read ||
static_cast<int64_t>(token_start_internal_value_) >
static_cast<int64_t>(std::numeric_limits<int32_t>::max())) {
SetError(Error::CBOR_INVALID_INT32);
return;
}
Expand Down