gh-154855: Ask non-ncurses curses for one more character - #154870
Open
serhiy-storchaka wants to merge 2 commits into
Open
gh-154855: Ask non-ncurses curses for one more character#154870serhiy-storchaka wants to merge 2 commits into
serhiy-storchaka wants to merge 2 commits into
Conversation
Passing n to the library is ncurses' reading of n: it stores n characters and adds a terminator. NetBSD curses counts the terminator in n. Ask a library that is neither ncurses nor PDCurses for n + 1, and read again if it stored more than asked; truncating could split a multibyte character. This is not possible for input, so getstr() and get_wstr() are left as they are. instr() now takes the length from the value returned by winnstr(), as X/Open specifies, instead of searching for a terminator which it does not.
serhiy-storchaka
added
needs backport to 3.13
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
instr(),in_wstr()andin_wchstr()passnto the library, which is ncurses' reading ofn: it storesncharacters and adds a terminator. NetBSD curses counts the terminator inn, so these methods return one character too few there. X/Open does not settle the point: "at mostnbytes in the string", with no mention of a terminator.Such a library is asked for
n + 1, and the read is repeated for the requested length if it stored more than asked -- truncating could split a multibyte character. That is not possible for input, where the extra character is consumed and echoed before we see it, sogetstr()andget_wstr()are left as they are.instr()now takes the length from the value returned bywinnstr(), as X/Open specifies, likein_wstr()since GH-154782.Against NetBSD 10.1 native curses (
--with-curses=curses),test_cursesgoes from 34 failures to 22, with nothing newly broken. Builds against ncurses are unchanged, the macro being 0; forcing it to 1 there makes 12 tests fail without the repeated read and pass with it.