diff options
| author | Gary Lockyer <gary@catalyst.net.nz> | 2019-05-22 11:43:54 +1200 |
|---|---|---|
| committer | Gary Lockyer <gary@samba.org> | 2019-05-22 03:03:43 +0000 |
| commit | 3e6661fd73bb24ef5700a98f676f1df5eeca408b (patch) | |
| tree | 88e975ec6baa04e674a7285904634f0757bc17d5 /source4 | |
| parent | 03cbef2beff02d54063648725a71be6479886d09 (diff) | |
| download | samba-3e6661fd73bb24ef5700a98f676f1df5eeca408b.tar.gz | |
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 <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Gary Lockyer <gary@samba.org>
Autobuild-Date(master): Wed May 22 03:03:43 UTC 2019 on sn-devel-184
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/rpc/pyrpc.c | 7 |
1 files 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; |