https://github.com/python/cpython/commit/6b8a9a10617817180f546e537d1b4407625390b9
commit: 6b8a9a10617817180f546e537d1b4407625390b9
branch: 3.12
author: neonene <[email protected]>
committer: kumaraditya303 <[email protected]>
date: 2024-08-02T13:44:55Z
summary:
[3.12] gh-122334: Fix crash when importing ssl after re-initialization
(GH-122481) (#122495)
Fix crash when importing ssl after re-initialization
The current METH_FASTCALL|METH_KEYWORDS functions in a non-builtin module can
cause segfaults after restarting the main interpreter, invoking
_PyArg_UnpackKeywords() with an insufficiently cleared _PyArg_Parser struct.
This patch fixes the invalidation of the static argument parsers.
files:
A Misc/NEWS.d/next/Library/2024-07-30-21-29-30.gh-issue-122334.LeoE1x.rst
M Lib/test/test_embed.py
M Python/getargs.c
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index bb798ca8a9a22c..5ce23223a0f97f 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -434,6 +434,21 @@ def add(cls, slot, own):
self.assertEqual(result, {})
self.assertEqual(out, '')
+ def test_getargs_reset_static_parser(self):
+ # Test _PyArg_Parser initializations via _PyArg_UnpackKeywords()
+ # https://github.com/python/cpython/issues/122334
+ code = textwrap.dedent("""
+ import _ssl
+ _ssl.txt2obj(txt='1.3')
+ print('1')
+
+ import _queue
+ _queue.SimpleQueue().put_nowait(item=None)
+ print('2')
+ """)
+ out, err = self.run_embedded_interpreter("test_repeated_init_exec",
code)
+ self.assertEqual(out, '1\n2\n' * INIT_LOOPS)
+
class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
maxDiff = 4096
diff --git
a/Misc/NEWS.d/next/Library/2024-07-30-21-29-30.gh-issue-122334.LeoE1x.rst
b/Misc/NEWS.d/next/Library/2024-07-30-21-29-30.gh-issue-122334.LeoE1x.rst
new file mode 100644
index 00000000000000..cef801c950faa6
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-07-30-21-29-30.gh-issue-122334.LeoE1x.rst
@@ -0,0 +1 @@
+Fix crash when importing :mod:`ssl` after the main interpreter restarts.
diff --git a/Python/getargs.c b/Python/getargs.c
index 02bddf0618e578..8ca865b53c8d54 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -2071,6 +2071,18 @@ parser_clear(struct _PyArg_Parser *parser)
if (parser->initialized == 1) {
Py_CLEAR(parser->kwtuple);
}
+
+ if (parser->format) {
+ parser->fname = NULL;
+ }
+ else {
+ assert(parser->fname != NULL);
+ }
+ parser->custom_msg = NULL;
+ parser->pos = 0;
+ parser->min = 0;
+ parser->max = 0;
+ parser->initialized = 0;
}
static PyObject*
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
