8000 gh-114670: Fix `_testbuffer` module initialization by sobolevn · Pull Request #114672 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-114670: Fix _testbuffer module initialization #114672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 10, 2024
Merged

gh-114670: Fix _testbuffer module initialization #114672

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7d9f2fd
gh-114670: Fix `_testbuffer` module initialization
sobolevn Jan 28, 2024
63c2bb2
Address review
sobolevn Jan 28, 2024
9e5e81a
Merge branch 'main' into issue-114670
sobolevn Feb 7, 2024
c36c054
Do not leak `structmodule` and `simple_format`
sobolevn Feb 7, 2024
5a56dbe
Revert "Do not leak `structmodule` and `simple_format`"
sobolevn Feb 7, 2024
b8ecc30
Address review
sobolevn Feb 8, 2024
cfcfb6a
Address review
sobolevn Feb 8, 2024
3d95285
Delete Misc/NEWS.d/next/Core and Builtins/2024-01-28-22-32-07.gh-issu…
sobolevn Feb 8, 2024
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
Next Next commit
gh-114670: Fix _testbuffer module initialization
  • Loading branch information
@sobolevn
sobolevn committed Jan 28, 2024
commit 7d9f2fd4f28b6d8d60b7af6b34b50a767bd223a9
107 changes: 65 additions & 42 deletions Modules/_testbuffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2823,63 +2823,86 @@ PyInit__testbuffer(void)
PyObject *m;

m = PyModule_Create(&_testbuffermodule);
if (m == NULL)
if (m == NULL) {
return NULL;
}

Py_SET_TYPE(&NDArray_Type, &PyType_Type);
Py_INCREF(&NDArray_Type);
PyModule_AddObject(m, "ndarray", (PyObject *)&NDArray_Type);
if (PyModule_AddObject(m, "ndarray", (PyObject *)&NDArray_Type) < 0) {
Py_DECREF(&NDArray_Type);
return NULL;
}

Py_SET_TYPE(&StaticArray_Type, &PyType_Type);
Py_INCREF(&StaticArray_Type);
PyModule_AddObject(m, "staticarray", (PyObject *)&StaticArray_Type);
if (PyModule_AddObject(m, "staticarray", (PyObject *)&StaticArray_Type) < 0) {
goto error;
}

structmodule = PyImport_ImportModule("struct");
if (structmodule == NULL)
return NULL;
if (structmodule == NULL) {
goto error;
}

Struct = PyObject_GetAttrString(structmodule, "Struct");
if (Struct == NULL) {
goto error;
}
calcsize = PyObject_GetAttrString(structmodule, "calcsize");
if (Struct == NULL || calcsize == NULL)
return NULL;
if (calcsize == NULL) {
goto error;
}

simple_format = PyUnicode_FromString(simple_fmt);
if (simple_format == NULL)
return NULL;
if (simple_format == NULL) {
goto error;
}

PyModule_AddIntMacro(m, ND_MAX_NDIM);
PyModule_AddIntMacro(m, ND_VAREXPORT);
PyModule_AddIntMacro(m, ND_WRITABLE);
PyModule_AddIntMacro(m, ND_FORTRAN);
PyModule_AddIntMacro(m, ND_SCALAR);
PyModule_AddIntMacro(m, ND_PIL);
PyModule_AddIntMacro(m, ND_GETBUF_FAIL);
PyModule_AddIntMacro(m, ND_GETBUF_UNDEFINED);
PyModule_AddIntMacro(m, ND_REDIRECT);

PyModule_AddIntMacro(m, PyBUF_SIMPLE);
PyModule_AddIntMacro(m, PyBUF_WRITABLE);
PyModule_AddIntMacro(m, PyBUF_FORMAT);
PyModule_AddIntMacro(m, PyBUF_ND);
PyModule_AddIntMacro(m, PyBUF_STRIDES);
PyModule_AddIntMacro(m, PyBUF_INDIRECT);
PyModule_AddIntMacro(m, PyBUF_C_CONTIGUOUS);
PyModule_AddIntMacro(m, PyBUF_F_CONTIGUOUS);
PyModule_AddIntMacro(m, PyBUF_ANY_CONTIGUOUS);
PyModule_AddIntMacro(m, PyBUF_FULL);
PyModule_AddIntMacro(m, PyBUF_FULL_RO);
PyModule_AddIntMacro(m, PyBUF_RECORDS);
PyModule_AddIntMacro(m, PyBUF_RECORDS_RO);
PyModule_AddIntMacro(m, PyBUF_STRIDED);
PyModule_AddIntMacro(m, PyBUF_STRIDED_RO);
PyModule_AddIntMacro(m, PyBUF_CONTIG);
PyModule_AddIntMacro(m, PyBUF_CONTIG_RO);

PyModule_AddIntMacro(m, PyBUF_READ);
PyModule_AddIntMacro(m, PyBUF_WRITE);
#define ADD_INT_MACRO(m, macro) \
do { \
if (PyModule_AddIntConstant(m, #macro, macro) < 0) { \
goto error; \
} \
} while (0)

ADD_INT_MACRO(m, ND_MAX_NDIM);
ADD_INT_MACRO(m, ND_VAREXPORT);
ADD_INT_MACRO(m, ND_WRITABLE);
ADD_INT_MACRO(m, ND_FORTRAN);
ADD_INT_MACRO(m, ND_SCALAR);
ADD_INT_MACRO(m, ND_PIL);
ADD_INT_MACRO(m, ND_GETBUF_FAIL);
ADD_INT_MACRO(m, ND_GETBUF_UNDEFINED);
ADD_INT_MACRO(m, ND_REDIRECT);

ADD_INT_MACRO(m, PyBUF_SIMPLE);
ADD_INT_MACRO(m, PyBUF_WRITABLE);
ADD_INT_MACRO(m, PyBUF_FORMAT);
ADD_INT_MACRO(m, PyBUF_ND);
ADD_INT_MACRO(m, PyBUF_STRIDES);
ADD_INT_MACRO(m, PyBUF_INDIRECT);
ADD_INT_MACRO(m, PyBUF_C_CONTIGUOUS);
ADD_INT_MACRO(m, PyBUF_F_CONTIGUOUS);
ADD_INT_MACRO(m, PyBUF_ANY_CONTIGUOUS);
ADD_INT_MACRO(m, PyBUF_FULL);
ADD_INT_MACRO(m, PyBUF_FULL_RO);
ADD_INT_MACRO(m, PyBUF_RECORDS);
ADD_INT_MACRO(m, PyBUF_RECORDS_RO);
ADD_INT_MACRO(m, PyBUF_STRIDED);
ADD_INT_MACRO(m, PyBUF_STRIDED_RO);
ADD_INT_MACRO(m, PyBUF_CONTIG);
ADD_INT_MACRO(m, PyBUF_CONTIG_RO);

ADD_INT_MACRO(m, PyBUF_READ);
ADD_INT_MACRO(m, PyBUF_WRITE);

#undef ADD_INT_MACRO

return m;
}



error:
Py_DECREF(&NDArray_Type);
Py_DECREF(&StaticArray_Type);
return NULL;
}
0