Catch end-of-string in the source string when performing a range match #116
+11
−7
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
Owner
Author
|
@borkovic I think this fixes the out-of-bounds access in |
borkovic
reviewed
May 18, 2025
match.c
Outdated
| p += r, m += r, s++; | ||
| continue; | ||
| } | ||
| break; |
Contributor
There was a problem hiding this comment.
Should break; (line 36) be outside if (*s) {...} (lines 30-37)?
Owner
Author
There was a problem hiding this comment.
Aha. Good catch. Now, I wonder if I can add a test to trip.rc to catch this misuse of the C switch statement.
Owner
Author
There was a problem hiding this comment.
As far as as I can tell the accidental fall through would consume some of the pattern string, though it's hard in this moment to provoke it into doing something bad. Nevertheless, I fixed the break statement.
rakitzis
force-pushed
the
trailing-rangematch
branch
from
e8f4d40 to
23eae3d
Compare
This commit guards the case for range matches (e.g., "[a-z]") with an end-of-string check for the source string. This prevents an inadvertent interpretation of the nul terminator as a matching character, as well as preventing bugs as in issue #115.
rakitzis
force-pushed
the
trailing-rangematch
branch
from
23eae3d to
e7cb583
Compare
Collaborator
|
Sorry for me being inactive for so long. Can we merge this, @rakitzis? |
Owner
Author
|
Yes, of course. |
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.
This commit guards the case for range matches (e.g., "[a-z]") with an end-of-string check for the source string.
This prevents an inadvertent interpretation of the nul terminator as a matching character, as well as preventing bugs as in issue #115.