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

Jump to bottom

fix(developer): correct use of u16chr when second parameter could be null #11894

Draft
wants to merge 18 commits into
base: master
Choose a base branch
from
Draft

fix(developer): correct use of u16chr when second parameter could be null #11894

wants to merge 18 commits into from
+183 −4

Conversation

markcsinclair
Copy link
Contributor

Fix the use of u16chr() with *q==0 in u16tok() bug (and anywhere else it is similarly misused) - see issue #11814

Tests for u16chr() and u16tok() (both variants) are included in gtest-kmxu16-test.cpp

Partially fixes: #11814 (another PR is needed for the first bug)

@keymanapp-test-bot skip

@markcsinclair markcsinclair marked this pull request as draft July 1, 2024 10:15
@markcsinclair markcsinclair self-assigned this Jul 1, 2024
@keymanapp-test-bot
Copy link

keymanapp-test-bot bot commented Jul 1, 2024 •
edited
Loading

User Test Results

Test specification and instructions

User tests are not required

Test Artifacts

@keymanapp-test-bot keymanapp-test-bot bot added this to the A18S5 milestone Jul 1, 2024
@mcdurdin mcdurdin mentioned this pull request Jul 2, 2024
Open
@mcdurdin
Copy link
Member

mcdurdin commented Jul 2, 2024

I independently encountered the u16tok bug. I have pushed my branch so you can compare: #11910.

@mcdurdin mcdurdin marked this pull request as ready for review July 5, 2024 08:10
@mcdurdin mcdurdin marked this pull request as draft July 5, 2024 08:11
@darcywong00 darcywong00 modified the milestones: A18S5, A18S6 Jul 5, 2024
@markcsinclair
chore(developer): Merge branch 'master' into fix/developer/correct-us…
6f4e8a1 
…e-of-u16chr-when-second-parameter-could-be-null

# Keyman Conventional Commit suggestions:
#
# - Link to a Sentry issue with git trailer:
#     Fixes: _MODULE_-_ID_
# - Give credit to co-authors:
#     Co-authored-by: _Name_ <_email_>
# - Use imperative, present tense ('attach' not 'attaches', 'attached' etc)
# - Don't include a period at the end of the title
# - Always include a blank line before trailers
# - More: https://github.com/keymanapp/keyman/wiki/Pull-Request-and-Commit-workflow-notes
@markcsinclair
fix(developer): add u16chr_compare_to_strchr test
629ae86
@markcsinclair
fix(developer): remove duplicate assertion
6a1ffb7
@markcsinclair
fix(developer): edits for consistency in use of str buffer and settin…
a486dd7 
…g of context before test cases
@markcsinclair
fix(developer): edits for consistency in u16cmp assertions
24c67df
@markcsinclair
fix(developer): additional assertions on ctx
a808833
@markcsinclair
Copy link
Contributor Author

markcsinclair commented Jul 11, 2024 •
edited
Loading

I think the tests for u16chr and u16tok (both variants) are complete, so the next task is to identify and correct any additional incorrect uses of u16chr, where second parameter could be null.

Possibilities include:

  • ProcessEthnologueStore() (see here)
  • LineTokenType() (two places, see here)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mcdurdin mcdurdin Awaiting requested review from mcdurdin mcdurdin is a code owner

@darcywong00 darcywong00 Awaiting requested review from darcywong00 darcywong00 is a code owner

At least 1 approving review is required to merge this pull request.

Assignees

@markcsinclair markcsinclair

Labels
developer/compilers/ developer/ fix
Milestone
A18S6
Development

Successfully merging this pull request may close these issues.

bug(developer): incorrect handling of second parameter of index in kmcmplib compiler
3 participants
@markcsinclair @mcdurdin @darcywong00