fix(developer): prevent buffer overrun in u16tok
#11910
Draft
+75
−4
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
User Test ResultsTest specification and instructions User tests are not required Test Artifacts
|
mcdurdin
commented
Jul 2, 2024
| @@ -243,7 +243,7 @@ KMX_WCHAR * u16tok(KMX_WCHAR *p, const KMX_WCHAR ch, KMX_WCHAR **ctx) { | |||
| else { | |||
| *ctx = NULL; | |||
| } | |||
| return p; | |||
| return *p ? p : NULL; | |||
There was a problem hiding this comment.
Prevents delimiters at end of string from returning an empty string. (Matching strtok behaviour)
| @@ -259,13 +259,13 @@ KMX_WCHAR * u16tok(KMX_WCHAR* p, const KMX_WCHAR* delim, KMX_WCHAR** ctx) { | |||
| if (*q) { | |||
| *q = 0; | |||
| q++; | |||
| while (u16chr(delim, *q)) q++; | |||
| while (*q && u16chr(delim, *q)) q++; | |||
SabineSIL
added a commit
that referenced
this pull request
Jul 3, 2024
markcsinclair
added a commit
that referenced
this pull request
Jul 4, 2024
markcsinclair
added a commit
that referenced
this pull request
Jul 4, 2024
Merge branch 'fix/developer/11814-kmx_u16-buffer-overrun' into fix/developer/correct-use-of-u16chr-when-second-parameter-could-be-null
markcsinclair
added a commit
that referenced
this pull request
Jul 4, 2024
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.
Relates-to: #11814
See-also: #11894
@keymanapp-test-bot skip