Fix #1070: bytes_to_read buffer size for Python 3.14 - #1074
Open
RachelXiaolan wants to merge 2 commits into
Open
Fix #1070: bytes_to_read buffer size for Python 3.14#1074RachelXiaolan wants to merge 2 commits into
RachelXiaolan wants to merge 2 commits into
Conversation
Fixes pyinvoke#1070. On Python 3.14, fcntl.ioctl rejects undersized mutable buffers (cpython#144206). `bytes_to_read()` was passing a 2-byte buffer to FIONREAD, which writes a C int (typically 4 bytes). The same bug was fixed for `_pty_size` in pyinvoke#1038, but `bytes_to_read` was missed. This worked by accident on <=3.13 thanks to CPython's 1024-byte static copy buffer that masked the size mismatch. CPython 3.14 tightened the check, so `Connection.run()` from a TTY-attached process on 3.14 now crashes with SystemError: buffer overflow in `handle_stdin`. Fix: pass a 4-byte buffer (`b"\x00\x00\x00\x00"`) and unpack as a signed int (`struct.unpack('i', ...)`) instead of signed short (`'h'`). Tests: tests/terminals/test_bytes_to_read.py covers: - buffer passed to ioctl is 4 bytes - result is the int parsed from the 4-byte C int - FIONREAD returning 0 is correctly handled - non-TTY fallback still returns 1 Test runs: - New tests: 3/3 pass - Full non-pty, non-runner suite: 774 passed (no regressions) - Pre-existing pty/runner failures in this sandbox are env-specific (no real TTY, no /dev/tty) and unrelated to this change Fixes pyinvoke#1070 Refs: AI-2138
|
The test file look very complicated and not useful. |
Replace the standalone test file with additions to the existing tests/terminals.py, matching the project's class-based test convention. Remove the over-engineered test_bytes_to_read.py. Fixes feedback from @hefee about test complexity.
Author
|
Thanks for the feedback @hefee! You're right — I overcomplicated it. I've removed the standalone test file and added the test cases directly to the existing
Both follow the same pattern as the existing |
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
3 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.
Fixes #1070.
Bug
On Python 3.14, fcntl.ioctl rejects undersized mutable buffers (cpython#144206).
bytes_to_read()was passing a 2-byte buffer to FIONREAD, which writes a C int (typically 4 bytes). Same root cause as the bug fixed in #1038 for_pty_size, butbytes_to_readwas missed.Worked by accident on <=3.13 thanks to CPython's 1024-byte static copy buffer. On 3.14,
Connection.run()from a TTY-attached process crashes with SystemError: buffer overflow inhandle_stdin.Fix
Pass a 4-byte buffer and unpack as a signed int:
Tests
tests/terminals/test_bytes_to_read.py— 3 cases:Refs: AI-2138