From 3e6661fd73bb24ef5700a98f676f1df5eeca408b Mon Sep 17 00:00:00 2001 From: Gary Lockyer Date: Wed, 22 May 2019 11:43:54 +1200 Subject: [PATCH] s4 librpc rpc pyrpc: Fix flapping dcerpc.bare tests Commit d65b7641c84976c543ded8f0de5ab2da3c19b407 had the parameters to talloc_reparent reversed. This caused the dcerpc.bare tests to flap. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13932 Signed-off-by: Gary Lockyer Reviewed-by: Andrew Bartlett Autobuild-User(master): Gary Lockyer Autobuild-Date(master): Wed May 22 03:03:43 UTC 2019 on sn-devel-184 --- source4/librpc/rpc/pyrpc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/source4/librpc/rpc/pyrpc.c b/source4/librpc/rpc/pyrpc.c index 09f3e32074b..5d10201bb70 100644 --- a/source4/librpc/rpc/pyrpc.c +++ b/source4/librpc/rpc/pyrpc.c @@ -305,12 +305,9 @@ static void dcerpc_interface_dealloc(PyObject* self) { dcerpc_InterfaceObject *interface = (dcerpc_InterfaceObject *)self; - /* - * This can't fail, and if it did talloc_unlink(NULL, NULL) is - * harmless below - */ struct tevent_context *ev_save = talloc_reparent( - NULL, interface->mem_ctx, interface->ev); + interface->mem_ctx, NULL, interface->ev); + SMB_ASSERT(ev_save != NULL); interface->binding_handle = NULL; interface->pipe = NULL; -- 2.47.3