Merge pull request #23350 from spikethehobbitmage:4.x

asmorkalov · web-flow · commit 66a5ecb7ec77 · 2023-04-03T14:08:32.000+03:00
Fix reference counting errors in registerNewType
diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
@@ -284,6 +284,7 @@ static bool init_submodule(PyObject * root, const char * name, PyMethodDef * met
 static inline
 bool registerTypeInModuleScope(PyObject* module, const char* type_name, PyObject* type_obj)
 {
+    Py_INCREF(type_obj); /// Give PyModule_AddObject a reference to steal.
     if (PyModule_AddObject(module, type_name, type_obj) < 0)
     {
         PyErr_Format(PyExc_ImportError,
diff --git a/modules/python/src2/pycompat.hpp b/modules/python/src2/pycompat.hpp
@@ -338,8 +338,10 @@ PyObject* pyopencv_from(const TYPE& src)
         if (!registerNewType(m, #EXPORT_NAME, (PyObject*)pyopencv_##CLASS_ID##_TypePtr, SCOPE)) \
         { \
             printf("Failed to register a new type: " #EXPORT_NAME  ", base (" #BASE ") in " SCOPE " \n"); \
+            Py_DECREF(pyopencv_##CLASS_ID##_TypePtr); \
             ERROR_HANDLER; \
         } \
+        Py_DECREF(pyopencv_##CLASS_ID##_TypePtr); \
     }
 
 // Debug module load:

Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,7 @@ static bool init_submodule(PyObject * root, const char * name, PyMethodDef * met`
`284`	`284`	`static inline`
`285`	`285`	`bool registerTypeInModuleScope(PyObject* module, const char* type_name, PyObject* type_obj)`
`286`	`286`	`{`
	`287`	`+ Py_INCREF(type_obj); /// Give PyModule_AddObject a reference to steal.`
`287`	`288`	`if (PyModule_AddObject(module, type_name, type_obj) < 0)`
`288`	`289`	`{`
`289`	`290`	`PyErr_Format(PyExc_ImportError,`