mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-41798: Allocate the _curses._C_API on the heap memory (GH-24186)

Browse source
This commit is contained in:
Hai Shi 2021-01-22 18:06:43 +08:00 • committed by GitHub
parent 644d52818a
commit 2f12a1b7ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Modules/_cursesmodule.c
View file

@ -4725,22 +4725,23 @@ static struct PyModuleDef _cursesmodule = {
NULL NULL
}; };
static void
curses_destructor(PyObject *op)
{
void *ptr = PyCapsule_GetPointer(op, PyCurses_CAPSULE_NAME);
Py_DECREF(*(void **)ptr);
PyMem_Free(ptr);
}
PyMODINIT_FUNC PyMODINIT_FUNC
PyInit__curses(void) PyInit__curses(void)
{ {
PyObject *m, *d, *v, *c_api_object; PyObject *m, *d, *v, *c_api_object;
static void *PyCurses_API[PyCurses_API_pointers];
/* Initialize object type */ /* Initialize object type */
if (PyType_Ready(&PyCursesWindow_Type) < 0) if (PyType_Ready(&PyCursesWindow_Type) < 0)
return NULL; return NULL;
/* Initialize the C API pointer array */
PyCurses_API[0] = (void *)&PyCursesWindow_Type;
PyCurses_API[1] = (void *)func_PyCursesSetupTermCalled;
PyCurses_API[2] = (void *)func_PyCursesInitialised;
PyCurses_API[3] = (void *)func_PyCursesInitialisedColor;
/* Create the module and add the functions */ /* Create the module and add the functions */
m = PyModule_Create(&_cursesmodule); m = PyModule_Create(&_cursesmodule);
if (m == NULL) if (m == NULL)
@ -4752,9 +4753,29 @@ PyInit__curses(void)
return NULL; return NULL;
ModDict = d; /* For PyCurses_InitScr to use later */ ModDict = d; /* For PyCurses_InitScr to use later */
void **PyCurses_API = PyMem_Calloc(PyCurses_API_pointers, sizeof(void *));
if (PyCurses_API == NULL) {
PyErr_NoMemory();
return NULL;
}
/* Initialize the C API pointer array */
PyCurses_API[0] = (void *)Py_NewRef(&PyCursesWindow_Type);
PyCurses_API[1] = (void *)func_PyCursesSetupTermCalled;
PyCurses_API[2] = (void *)func_PyCursesInitialised;
PyCurses_API[3] = (void *)func_PyCursesInitialisedColor;
/* Add a capsule for the C API */ /* Add a capsule for the C API */
c_api_object = PyCapsule_New(PyCurses_API, PyCurses_CAPSULE_NAME, NULL); c_api_object = PyCapsule_New(PyCurses_API, PyCurses_CAPSULE_NAME,
PyDict_SetItemString(d, "_C_API", c_api_object); curses_destructor);
if (c_api_object == NULL) {
Py_DECREF(PyCurses_API[0]);
PyMem_Free(PyCurses_API);
return NULL;
}
if (PyDict_SetItemString(d, "_C_API", c_api_object) < 0) {
Py_DECREF(c_api_object);
return NULL;
}
Py_DECREF(c_api_object); Py_DECREF(c_api_object);
/* For exception curses.error */ /* For exception curses.error */