Add steps for parsing the blocklist and testing blocklistedness #239
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
reillyeon
requested changes
Aug 7, 2023
reillyeon
requested changes
Oct 10, 2023
reillyeon
approved these changes
Oct 10, 2023
index.bs
Outdated
| 1. Let |idVendor| be the result of interpreting |components|[0] as a | ||
| hexadecimal number. | ||
| 1. Let |idProduct| be the result of interpreting |components|[1] as a | ||
| hexadecimal number. | ||
| 1. If the [=list/size=] of |components| is: | ||
| * 2: Let |bcdDevice| be <code>0xFFFF</code>. |
There was a problem hiding this comment.
This line is no longer necessary.
There was a problem hiding this comment.
I think this is still needed, otherwise bcdDevice will be uninitialized when we create the USBBlocklistEntry.
There was a problem hiding this comment.
Ah, then this needs to be swapped with the "if" above so that it is set to this default when components only has 2 elements.
There was a problem hiding this comment.
I don't understand the issue. If we move the if lower then |components|[1] will be an OOB access if the line doesn't have any ':' code points.
How about:
1. Let |components| be the result of [=strictly splitting=] |line|
starting from the beginning of |line| on code point <code>':'</code>.
1. If the [=list/size=] of |components| is not 2 or 3,
[=iteration/continue=].
1. Let |idVendor| be the result of interpreting |components|[0] as a
hexadecimal number.
1. Let |idProduct| be the result of interpreting |components|[1] as a
hexadecimal number.
1. Let |bcdDevice| be <code>0xFFFF</code>.
1. If the [=list/size=] of |components| is 3, set |bcdDevice| to the
result of interpreting |components|[2] as a hexadecimal number.
1. [=list/Append=] a new {{USBBlocklistEntry}} with |idVendor|,
|idProduct|, and |bcdDevice| to |blocklist|.
index.bs
Outdated
| 1. Let |idVendor| be the result of interpreting |components|[0] as a | ||
| hexadecimal number. | ||
| 1. Let |idProduct| be the result of interpreting |components|[1] as a | ||
| hexadecimal number. | ||
| 1. If the [=list/size=] of |components| is: |
There was a problem hiding this comment.
Suggested change
| 1. If the [=list/size=] of |components| is: | |
| 1. If the [=list/size=] of |components| is 3: |
reillyeon
approved these changes
Oct 11, 2023
github-actions bot
added a commit
that referenced
this pull request
Oct 12, 2023
SHA: 59614e7 Reason: push, by nondebug Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
github-actions bot
added a commit
that referenced
this pull request
Oct 12, 2023
SHA: 59614e7 Reason: push, by nondebug Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Preview | Diff