From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Tue, 23 May 2023 00:49:28 +0000 (+1200)
Subject: s4/messaging/py: Fix leak of p_server_id
X-Git-Tag: talloc-2.4.1~592
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3ce96c9ebd0b415949a7ffac9ae06125e78bc2a7;p=thirdparty%2Fsamba.git

s4/messaging/py: Fix leak of p_server_id

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

diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c
index 2fb201edf29..3b0771816a7 100644
--- a/source4/lib/messaging/pymessaging.c
+++ b/source4/lib/messaging/pymessaging.c
@@ -210,18 +210,18 @@ static void py_msg_callback_wrapper(struct imessaging_context *msg,
 	}
 	*p_server_id = server_id;
 
-	if (!PyArg_ParseTuple(callback_and_tuple, "OO",
-			      &callback,
-			      &py_private)) {
-		return;
-	}
-
 	py_server_id = py_return_ndr_struct("samba.dcerpc.server_id", "server_id", p_server_id, p_server_id);
 	talloc_unlink(NULL, p_server_id);
 	if (py_server_id == NULL) {
 		return;
 	}
 
+	if (!PyArg_ParseTuple(callback_and_tuple, "OO",
+			      &callback,
+			      &py_private)) {
+		return;
+	}
+
 	result = PyObject_CallFunction(callback, discard_const_p(char, "OiOs#"),
 				       py_private,
 				       msg_type,