Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Lib/test/test_cmd_line.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,25 @@ def test_run_module_bug1764407(self):
self.assertTrue(data.find(b'1 loop') != -1)
self.assertTrue(data.find(b'__main__.Timer') != -1)

@support.cpython_only
def test_null_byte_in_interactive_mode(self):
# gh-140594: heap-buffer-underflow in PyOS_StdioReadline when a NUL (\0) is present in interactive input
Comment thread
ashm-dev marked this conversation as resolved.
Outdated
with os_helper.EnvironmentVarGuard() as env:
env.unset('PYTHONSTARTUP')
args = [sys.executable, '-I', '-S', '-q', '-i']
Comment thread
ashm-dev marked this conversation as resolved.
Outdated
p = subprocess.Popen(
args,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
env=env.copy(),
)
out, _ = p.communicate(b'\x00', timeout=10)
self.assertEqual(
p.returncode, 0,
msg=f"Interpreter aborted on NUL input, output:\n{out[:500]!r}"
)

def test_relativedir_bug46421(self):
# Test `python -m unittest` with a relative directory beginning with ./
# Note: We have to switch to the project's top module's directory, as per
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix a buffer overflow in :c:func:`!PyOS_StdioReadline` when a single NULL character is read from the standard input.
Comment thread
ashm-dev marked this conversation as resolved.
Outdated
Patch by Shamil Abdulaev.
2 changes: 1 addition & 1 deletion Parser/myreadline.c
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ PyOS_StdioReadline(FILE *sys_stdin, FILE *sys_stdout, const char *prompt)
break;
}
n += strlen(p + n);
} while (p[n-1] != '\n');
Comment thread
ashm-dev marked this conversation as resolved.
} while (n > 0 && p[n-1] != '\n');

pr = (char *)PyMem_RawRealloc(p, n+1);
Comment thread
ashm-dev marked this conversation as resolved.
if (pr == NULL) {
Expand Down
Loading