Apr 27, 2023 · Mar 24, 2023 · Mar 24, 2023 · Mar 28, 2023 · Apr 26, 2023 · Apr 26, 2023
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
    PyObject *keep;  // If set, a reference to the original CDataObject.
 } StructParamObject;

 static int
 StructParam_traverse(StructParamObject *self, visitproc visit, void *arg)
 {
    Py_VISIT(Py_TYPE(self));
    return 0;
 }

 static int
 StructParam_clear(StructParamObject *self)
 {
    Py_CLEAR(self->keep);
    return 0;
 }

 static void
 StructParam_dealloc(PyObject *myself)
 {
    StructParamObject *self = (StructParamObject *)myself;
    Py_XDECREF(self->keep);
    PyTypeObject *tp = Py_TYPE(self);
    PyObject_GC_UnTrack(myself);
    (void)StructParam_clear(self);
    PyMem_Free(self->ptr);
    Py_TYPE(self)->tp_free(myself);
    tp->tp_free(myself);
    Py_DECREF(tp);
 }

 static PyType_Slot structparam_slots[] = {
    {Py_tp_traverse, StructParam_traverse},
    {Py_tp_clear, StructParam_clear},
    {Py_tp_dealloc, StructParam_dealloc},
    {0, NULL},
 };

 staticPyTypeObject StructParam_Type = {
 PyVarObject_HEAD_INIT(NULL, 0)
    .tp_name ="_ctypes.StructParam_Type",
    .tp_basicsize =sizeof(StructParamObject),
 .tp_dealloc = StructParam_dealloc,
    .tp_flags =Py_TPFLAGS_DEFAULT,
 staticPyType_Spec structparam_spec = {
 .name = "_ctypes.StructParam_Type",
    .basicsize =sizeof(StructParamObject),
    .flags =(Py_TPFLAGS_DEFAULT | Py_TPFLAGS_IMMUTABLETYPE |
          Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_DISALLOW_INSTANTIATION),
    .slots =structparam_slots,
 };


        /* Create a Python object which calls PyMem_Free(ptr) in
           its deallocator. The object will be destroyed
           at _ctypes_callproc() cleanup. */
        obj = (&StructParam_Type)->tp_alloc(&StructParam_Type, 0);
        ctypes_state *st = GLOBAL_STATE();
        PyTypeObject *tp = st->StructParam_Type;
        obj = tp->tp_alloc(tp, 0);
        if (obj == NULL) {
            PyMem_Free(ptr);
            return NULL;
     */

    CREATE_TYPE(mod, st->DictRemover_Type, &dictremover_spec);
 TYPE_READY(&StructParam_Type);
 CREATE_TYPE(mod, st->StructParam_Type, &structparam_spec);

 #ifdef MS_WIN32
    TYPE_READY_BASE(&PyComError_Type, (PyTypeObject*)PyExc_Exception);
diff --git a/Modules/_ctypes/ctypes.h b/Modules/_ctypes/ctypes.h
    PyTypeObject *PyCArg_Type;
    PyTypeObject *PyCField_Type;
    PyTypeObject *PyCThunk_Type;
    PyTypeObject *StructParam_Type;
 } ctypes_state;

 extern ctypes_state global_state;
diff --git a/Tools/c-analyzer/cpython/globals-to-fix.tsv b/Tools/c-analyzer/cpython/globals-to-fix.tsv
 Modules/_ctypes/_ctypes.c-PyCSimpleType_Type-
 Modules/_ctypes/_ctypes.c-PyCStructType_Type-
 Modules/_ctypes/_ctypes.c-Simple_Type-
 Modules/_ctypes/_ctypes.c-StructParam_Type-
 Modules/_ctypes/_ctypes.c-Struct_Type-
 Modules/_ctypes/_ctypes.c-UnionType_Type-
 Modules/_ctypes/_ctypes.c-Union_Type-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -413,23 +413,45 @@ typedef struct {
		PyObject *keep; // If set, a reference to the original CDataObject.
		} StructParamObject;

		static int
		StructParam_traverse(StructParamObject self, visitproc visit, void arg)
		{
		Py_VISIT(Py_TYPE(self));
		return 0;
		}

		static int
		StructParam_clear(StructParamObject *self)
		{
		Py_CLEAR(self->keep);
		return 0;
		}

		static void
		StructParam_dealloc(PyObject *myself)
		{
		StructParamObject self = (StructParamObject )myself;
		Py_XDECREF(self->keep);
		PyTypeObject *tp = Py_TYPE(self);
		PyObject_GC_UnTrack(myself);
		(void)StructParam_clear(self);
		PyMem_Free(self->ptr);
		Py_TYPE(self)->tp_free(myself);
		tp->tp_free(myself);
		Py_DECREF(tp);
		}

		static PyType_Slot structparam_slots[] = {
		{Py_tp_traverse, StructParam_traverse},
		{Py_tp_clear, StructParam_clear},
		{Py_tp_dealloc, StructParam_dealloc},
		{0, NULL},
		};

		staticPyTypeObject StructParam_Type = {
		PyVarObject_HEAD_INIT(NULL, 0)
		.tp_name ="_ctypes.StructParam_Type",
		.tp_basicsize =sizeof(StructParamObject),
		.tp_dealloc = StructParam_dealloc,
		.tp_flags =Py_TPFLAGS_DEFAULT,
		staticPyType_Spec structparam_spec = {
		.name = "_ctypes.StructParam_Type",
		.basicsize =sizeof(StructParamObject),
		.flags =(Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_IMMUTABLETYPE \|
		Py_TPFLAGS_HAVE_GC \| Py_TPFLAGS_DISALLOW_INSTANTIATION),
		.slots =structparam_slots,
		};


Expand DownExpand Up		@@ -458,7 +480,9 @@ StructUnionType_paramfunc(CDataObject *self)
		/* Create a Python object which calls PyMem_Free(ptr) in
		its deallocator. The object will be destroyed
		at _ctypes_callproc() cleanup. */
		obj = (&StructParam_Type)->tp_alloc(&StructParam_Type, 0);
		ctypes_state *st = GLOBAL_STATE();
		PyTypeObject *tp = st->StructParam_Type;
		obj = tp->tp_alloc(tp, 0);
		if (obj == NULL) {
		PyMem_Free(ptr);
		return NULL;
Expand DownExpand Up		@@ -5694,7 +5718,7 @@ _ctypes_add_types(PyObject *mod)
		*/

		CREATE_TYPE(mod, st->DictRemover_Type, &dictremover_spec);
		TYPE_READY(&StructParam_Type);
		CREATE_TYPE(mod, st->StructParam_Type, &structparam_spec);

		#ifdef MS_WIN32
		TYPE_READY_BASE(&PyComError_Type, (PyTypeObject*)PyExc_Exception);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,6 +37,7 @@ typedef struct {
		PyTypeObject *PyCArg_Type;
		PyTypeObject *PyCField_Type;
		PyTypeObject *PyCThunk_Type;
		PyTypeObject *StructParam_Type;
		} ctypes_state;

		extern ctypes_state global_state;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -351,7 +351,6 @@ Modules/_ctypes/_ctypes.c-PyCPointer_Type-
		Modules/_ctypes/_ctypes.c-PyCSimpleType_Type-
		Modules/_ctypes/_ctypes.c-PyCStructType_Type-
		Modules/_ctypes/_ctypes.c-Simple_Type-
		Modules/_ctypes/_ctypes.c-StructParam_Type-
		Modules/_ctypes/_ctypes.c-Struct_Type-
		Modules/_ctypes/_ctypes.c-UnionType_Type-
		Modules/_ctypes/_ctypes.c-Union_Type-
Expand Down