mirror of
https://github.com/python/cpython.git
synced 2024-11-24 08:52:25 +01:00
c2627d6eea
This PR adds the ability to enable the GIL if it was disabled at interpreter startup, and modifies the multi-phase module initialization path to enable the GIL when loading a module, unless that module's spec includes a slot indicating it can run safely without the GIL. PEP 703 called the constant for the slot `Py_mod_gil_not_used`; I went with `Py_MOD_GIL_NOT_USED` for consistency with gh-104148. A warning will be issued up to once per interpreter for the first GIL-using module that is loaded. If `-v` is given, a shorter message will be printed to stderr every time a GIL-using module is loaded (including the first one that issues a warning).
53 lines
1.1 KiB
C
53 lines
1.1 KiB
C
#include <Python.h>
|
|
#include <stdlib.h>
|
|
#include <inttypes.h>
|
|
|
|
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
|
|
|
|
static PyObject* _fuzz_run(PyObject* self, PyObject* args) {
|
|
const char* buf;
|
|
Py_ssize_t size;
|
|
if (!PyArg_ParseTuple(args, "s#", &buf, &size)) {
|
|
return NULL;
|
|
}
|
|
int rv = LLVMFuzzerTestOneInput((const uint8_t*)buf, size);
|
|
if (PyErr_Occurred()) {
|
|
return NULL;
|
|
}
|
|
if (rv != 0) {
|
|
// Nonzero return codes are reserved for future use.
|
|
PyErr_Format(
|
|
PyExc_RuntimeError, "Nonzero return code from fuzzer: %d", rv);
|
|
return NULL;
|
|
}
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
static PyMethodDef module_methods[] = {
|
|
{"run", (PyCFunction)_fuzz_run, METH_VARARGS, ""},
|
|
{NULL},
|
|
};
|
|
|
|
static PyModuleDef_Slot module_slots[] = {
|
|
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
|
|
{0, NULL},
|
|
};
|
|
|
|
static struct PyModuleDef _fuzzmodule = {
|
|
PyModuleDef_HEAD_INIT,
|
|
"_fuzz",
|
|
NULL,
|
|
0,
|
|
module_methods,
|
|
module_slots,
|
|
NULL,
|
|
NULL,
|
|
NULL
|
|
};
|
|
|
|
PyMODINIT_FUNC
|
|
PyInit__xxtestfuzz(void)
|
|
{
|
|
return PyModuleDef_Init(&_fuzzmodule);
|
|
}
|