[Python-checkins] [3.10] gh-100689: Revert "bpo-41798: pyexpat: Allocate the expat_CAPI on the heap memory (GH-24061)" (GH-100745) (#100847)
kumaraditya303
webhook-mailer at python.org
Sun Jan 8 08:35:45 EST 2023
https://github.com/python/cpython/commit/0e00bce5619003009255c638998d9878eedac106
commit: 0e00bce5619003009255c638998d9878eedac106
branch: 3.10
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: kumaraditya303 <59607654+kumaraditya303 at users.noreply.github.com>
date: 2023-01-08T19:05:40+05:30
summary:
[3.10] gh-100689: Revert "bpo-41798: pyexpat: Allocate the expat_CAPI on the heap memory (GH-24061)" (GH-100745) (#100847)
gh-100689: Revert "bpo-41798: pyexpat: Allocate the expat_CAPI on the heap memory (GH-24061)" (GH-100745)
* gh-100689: Revert "bpo-41798: pyexpat: Allocate the expat_CAPI on the heap memory (GH-24061)"
This reverts commit 7c83eaa536d2f436ae46211ca48692f576c732f0.
(cherry picked from commit b034fd3e5926c63a681a211087b4c666834c7525)
Co-authored-by: Nikita Sobolev <mail at sobolevn.me>
Co-authored-by: Nikita Sobolev <mail at sobolevn.me>
files:
A Misc/NEWS.d/next/Library/2023-01-04-12-58-59.gh-issue-100689.Ce0ITG.rst
M Modules/pyexpat.c
diff --git a/Misc/NEWS.d/next/Library/2023-01-04-12-58-59.gh-issue-100689.Ce0ITG.rst b/Misc/NEWS.d/next/Library/2023-01-04-12-58-59.gh-issue-100689.Ce0ITG.rst
new file mode 100644
index 000000000000..09aeab7bceaa
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-01-04-12-58-59.gh-issue-100689.Ce0ITG.rst
@@ -0,0 +1 @@
+Fix crash in :mod:`pyexpat` by statically allocating ``PyExpat_CAPI`` capsule.
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index b3d9bdda7e7a..4d7196a8348f 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1843,13 +1843,6 @@ add_features(PyObject *mod)
}
#endif
-static void
-pyexpat_destructor(PyObject *op)
-{
- void *p = PyCapsule_GetPointer(op, PyExpat_CAPSULE_NAME);
- PyMem_Free(p);
-}
-
static int
pyexpat_exec(PyObject *mod)
{
@@ -1933,46 +1926,40 @@ pyexpat_exec(PyObject *mod)
MYCONST(XML_PARAM_ENTITY_PARSING_ALWAYS);
#undef MYCONST
- struct PyExpat_CAPI *capi = PyMem_Calloc(1, sizeof(struct PyExpat_CAPI));
- if (capi == NULL) {
- PyErr_NoMemory();
- return -1;
- }
+ static struct PyExpat_CAPI capi;
/* initialize pyexpat dispatch table */
- capi->size = sizeof(*capi);
- capi->magic = PyExpat_CAPI_MAGIC;
- capi->MAJOR_VERSION = XML_MAJOR_VERSION;
- capi->MINOR_VERSION = XML_MINOR_VERSION;
- capi->MICRO_VERSION = XML_MICRO_VERSION;
- capi->ErrorString = XML_ErrorString;
- capi->GetErrorCode = XML_GetErrorCode;
- capi->GetErrorColumnNumber = XML_GetErrorColumnNumber;
- capi->GetErrorLineNumber = XML_GetErrorLineNumber;
- capi->Parse = XML_Parse;
- capi->ParserCreate_MM = XML_ParserCreate_MM;
- capi->ParserFree = XML_ParserFree;
- capi->SetCharacterDataHandler = XML_SetCharacterDataHandler;
- capi->SetCommentHandler = XML_SetCommentHandler;
- capi->SetDefaultHandlerExpand = XML_SetDefaultHandlerExpand;
- capi->SetElementHandler = XML_SetElementHandler;
- capi->SetNamespaceDeclHandler = XML_SetNamespaceDeclHandler;
- capi->SetProcessingInstructionHandler = XML_SetProcessingInstructionHandler;
- capi->SetUnknownEncodingHandler = XML_SetUnknownEncodingHandler;
- capi->SetUserData = XML_SetUserData;
- capi->SetStartDoctypeDeclHandler = XML_SetStartDoctypeDeclHandler;
- capi->SetEncoding = XML_SetEncoding;
- capi->DefaultUnknownEncodingHandler = PyUnknownEncodingHandler;
+ capi.size = sizeof(capi);
+ capi.magic = PyExpat_CAPI_MAGIC;
+ capi.MAJOR_VERSION = XML_MAJOR_VERSION;
+ capi.MINOR_VERSION = XML_MINOR_VERSION;
+ capi.MICRO_VERSION = XML_MICRO_VERSION;
+ capi.ErrorString = XML_ErrorString;
+ capi.GetErrorCode = XML_GetErrorCode;
+ capi.GetErrorColumnNumber = XML_GetErrorColumnNumber;
+ capi.GetErrorLineNumber = XML_GetErrorLineNumber;
+ capi.Parse = XML_Parse;
+ capi.ParserCreate_MM = XML_ParserCreate_MM;
+ capi.ParserFree = XML_ParserFree;
+ capi.SetCharacterDataHandler = XML_SetCharacterDataHandler;
+ capi.SetCommentHandler = XML_SetCommentHandler;
+ capi.SetDefaultHandlerExpand = XML_SetDefaultHandlerExpand;
+ capi.SetElementHandler = XML_SetElementHandler;
+ capi.SetNamespaceDeclHandler = XML_SetNamespaceDeclHandler;
+ capi.SetProcessingInstructionHandler = XML_SetProcessingInstructionHandler;
+ capi.SetUnknownEncodingHandler = XML_SetUnknownEncodingHandler;
+ capi.SetUserData = XML_SetUserData;
+ capi.SetStartDoctypeDeclHandler = XML_SetStartDoctypeDeclHandler;
+ capi.SetEncoding = XML_SetEncoding;
+ capi.DefaultUnknownEncodingHandler = PyUnknownEncodingHandler;
#if XML_COMBINED_VERSION >= 20100
- capi->SetHashSalt = XML_SetHashSalt;
+ capi.SetHashSalt = XML_SetHashSalt;
#else
- capi->SetHashSalt = NULL;
+ capi.SetHashSalt = NULL;
#endif
/* export using capsule */
- PyObject *capi_object = PyCapsule_New(capi, PyExpat_CAPSULE_NAME,
- pyexpat_destructor);
+ PyObject *capi_object = PyCapsule_New(&capi, PyExpat_CAPSULE_NAME, NULL);
if (capi_object == NULL) {
- PyMem_Free(capi);
return -1;
}
More information about the Python-checkins
mailing list