Fix ICE #91268 by checking that the snippet ends with a )
#91273
Conversation
This file contains hidden or 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
|
r? @estebank (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
Badel2
force-pushed
the
ice-index-str
branch
from
84a0c1f to
0da3a0f
Compare
apiraino
added
the
T-compiler
|
@bors r+ |
|
📌 Commit 0da3a0f has been approved by |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 3, 2021
Fix ICE rust-lang#91268 by checking that the snippet ends with a `)` Fix rust-lang#91268 Previously it was assumed that the last character of `snippet` will be a `)`, so using `snippet.len() - 1` as an index should be safe. However as we see in the test, it is possible to enter that branch without a closing `)`, and it will trigger the panic if the last character happens to be multibyte. The fix is to ensure that the snippet ends with `)`, and skip the suggestion otherwise.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Dec 3, 2021
Fix ICE rust-lang#91268 by checking that the snippet ends with a `)` Fix rust-lang#91268 Previously it was assumed that the last character of `snippet` will be a `)`, so using `snippet.len() - 1` as an index should be safe. However as we see in the test, it is possible to enter that branch without a closing `)`, and it will trigger the panic if the last character happens to be multibyte. The fix is to ensure that the snippet ends with `)`, and skip the suggestion otherwise.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 3, 2021
…askrgr Rollup of 10 pull requests Successful merges: - rust-lang#88906 (Implement write() method for Box<MaybeUninit<T>>) - rust-lang#90269 (Make `Option::expect` unstably const) - rust-lang#90854 (Type can be unsized and uninhabited) - rust-lang#91170 (rustdoc: preload fonts) - rust-lang#91273 (Fix ICE rust-lang#91268 by checking that the snippet ends with a `)`) - rust-lang#91381 (Android: -ldl must appear after -lgcc when linking) - rust-lang#91453 (Document Windows TLS drop behaviour) - rust-lang#91462 (Use try_normalize_erasing_regions in needs_drop) - rust-lang#91474 (suppress warning about set_errno being unused on DragonFly) - rust-lang#91483 (Sync rustfmt subtree) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
|
☔ The latest upstream changes (presumably #91486) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
|
This has been merged into master by bors (in #91486), but GitHub didn't detect it for whatever reason. Closing. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
Fix #91268
Previously it was assumed that the last character of
snippetwill be a), so usingsnippet.len() - 1as an index should be safe. However as we see in the test, it is possible to enter that branch without a closing), and it will trigger the panic if the last character happens to be multibyte.The fix is to ensure that the snippet ends with
), and skip the suggestion otherwise.