diff options
author | Peter Bierma <zintensitydev@gmail.com> | 2024-12-05 11:07:38 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-12-05 16:07:38 +0000 |
commit | 208b0fb645c0e14b0826c0014e74a0b70c58c9d6 (patch) | |
tree | 2e4f8541c8de96054a8fad7443f8b3e867fac63c | |
parent | 67b9a5331ae45aa126877d7f96a1e235600f9c4b (diff) | |
download | cpython-208b0fb645c0e14b0826c0014e74a0b70c58c9d6.tar.gz cpython-208b0fb645c0e14b0826c0014e74a0b70c58c9d6.zip |
gh-122431: Disallow negative values in `readline.append_history_file` (#122469)
Co-authored-by: Victor Stinner <vstinner@python.org>
-rw-r--r-- | Lib/test/test_readline.py | 8 | ||||
-rw-r--r-- | Misc/NEWS.d/next/Library/2024-07-30-11-37-40.gh-issue-122431.lAzVtu.rst | 1 | ||||
-rw-r--r-- | Modules/readline.c | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py index 50e77cbbb6b..8b8772c66ee 100644 --- a/Lib/test/test_readline.py +++ b/Lib/test/test_readline.py @@ -114,6 +114,14 @@ class TestHistoryManipulation (unittest.TestCase): # write_history_file can create the target readline.write_history_file(hfilename) + # Negative values should be disallowed + with self.assertRaises(ValueError): + readline.append_history_file(-42, hfilename) + + # See gh-122431, using the minimum signed integer value caused a segfault + with self.assertRaises(ValueError): + readline.append_history_file(-2147483648, hfilename) + def test_nonascii_history(self): readline.clear_history() try: diff --git a/Misc/NEWS.d/next/Library/2024-07-30-11-37-40.gh-issue-122431.lAzVtu.rst b/Misc/NEWS.d/next/Library/2024-07-30-11-37-40.gh-issue-122431.lAzVtu.rst new file mode 100644 index 00000000000..16ad75792ae --- /dev/null +++ b/Misc/NEWS.d/next/Library/2024-07-30-11-37-40.gh-issue-122431.lAzVtu.rst @@ -0,0 +1 @@ +:func:`readline.append_history_file` now raises a :exc:`ValueError` when given a negative value. diff --git a/Modules/readline.c b/Modules/readline.c index 35655c70a46..7d1f703f7db 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -351,6 +351,12 @@ readline_append_history_file_impl(PyObject *module, int nelements, PyObject *filename_obj) /*[clinic end generated code: output=5df06fc9da56e4e4 input=784b774db3a4b7c5]*/ { + if (nelements < 0) + { + PyErr_SetString(PyExc_ValueError, "nelements must be positive"); + return NULL; + } + PyObject *filename_bytes; const char *filename; int err; |