From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Mon, 3 May 2021 02:42:10 +0000 (+1200)
Subject: python: Ensure reference counts are properly incremented
X-Git-Tag: tevent-0.11.0~805
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=290c1dc0975867a71c02e911708323d1f38b6f96;p=thirdparty%2Fsamba.git

python: Ensure reference counts are properly incremented

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 15e4232f0c8..41decc45f61 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -41,7 +41,7 @@ static PyObject *pytalloc_report_full(PyObject *self, PyObject *args)
 	} else {
 		talloc_report_full(pytalloc_get_mem_ctx(py_obj), stdout);
 	}
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 /* enable null tracking */
@@ -49,7 +49,7 @@ static PyObject *pytalloc_enable_null_tracking(PyObject *self,
 		PyObject *Py_UNUSED(ignored))
 {
 	talloc_enable_null_tracking();
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 /* return the number of talloc blocks */
diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c
index c527143ec70..b5ec85a48d4 100644
--- a/libgpo/pygpo.c
+++ b/libgpo/pygpo.c
@@ -41,7 +41,7 @@ static PyObject* GPO_get_##ATTR(PyObject *self, void *closure) \
 	if (gpo_ptr->ATTR) \
 		return PyUnicode_FromString(gpo_ptr->ATTR); \
 	else \
-		return Py_None; \
+		Py_RETURN_NONE; \
 }
 GPO_getter(ds_path)
 GPO_getter(file_sys_path)
diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index 568fc7c8db7..490fcbecd58 100644
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -426,9 +426,9 @@ static PyObject *py_gensec_have_feature(PyObject *self, PyObject *args)
 		return NULL;
 
 	if (gensec_have_feature(security, feature)) {
-		return Py_True;
+		Py_RETURN_TRUE;
 	} 
-	return Py_False;
+	Py_RETURN_FALSE;
 }
 
 static PyObject *py_gensec_set_max_update_size(PyObject *self, PyObject *args)
diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c
index f3cc9d13a7f..b5531d58304 100644
--- a/source4/librpc/ndr/py_security.c
+++ b/source4/librpc/ndr/py_security.c
@@ -342,7 +342,7 @@ static PyObject *py_descriptor_richcmp(
 		break;
 	}
 
-	return Py_NotImplemented;
+	Py_RETURN_NOTIMPLEMENTED;
 }
 
 static void py_descriptor_patch(PyTypeObject *type)
diff --git a/source4/ntvfs/posix/python/pyposix_eadb.c b/source4/ntvfs/posix/python/pyposix_eadb.c
index c64a388bfc7..abf397f990c 100644
--- a/source4/ntvfs/posix/python/pyposix_eadb.c
+++ b/source4/ntvfs/posix/python/pyposix_eadb.c
@@ -32,7 +32,7 @@
 static PyObject *py_is_xattr_supported(PyObject *self,
 			PyObject *Py_UNUSED(ignored))
 {
-	return Py_True;
+	Py_RETURN_TRUE;
 }
 
 static PyObject *py_wrap_setxattr(PyObject *self, PyObject *args)
diff --git a/source4/ntvfs/posix/python/pyxattr_native.c b/source4/ntvfs/posix/python/pyxattr_native.c
index 3be896911f2..d242cd98a5d 100644
--- a/source4/ntvfs/posix/python/pyxattr_native.c
+++ b/source4/ntvfs/posix/python/pyxattr_native.c
@@ -29,9 +29,9 @@ static PyObject *py_is_xattr_supported(PyObject *self,
 		PyObject *Py_UNUSED(ignored))
 {
 #if !defined(HAVE_XATTR_SUPPORT)
-	return Py_False;
+	Py_RETURN_FALSE;
 #else
-	return Py_True;
+	Py_RETURN_TRUE;
 #endif
 }
 
diff --git a/source4/ntvfs/posix/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c
index b457c86e066..425fd868ca0 100644
--- a/source4/ntvfs/posix/python/pyxattr_tdb.c
+++ b/source4/ntvfs/posix/python/pyxattr_tdb.c
@@ -36,7 +36,7 @@
 static PyObject *py_is_xattr_supported(PyObject *self,
 		PyObject *Py_UNUSED(ignored))
 {
-	return Py_True;
+	Py_RETURN_TRUE;
 }
 
 static PyObject *py_wrap_setxattr(PyObject *self, PyObject *args)