diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2016-02-25 13:57:37 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2016-03-08 01:58:26 +0100 |
| commit | 90bf114f6370ee837d97e36eb25f38f8234dcd39 (patch) | |
| tree | 7854bc55c7e0e86bbf90f0ac756d84ef4f32aac0 /pidl | |
| parent | dffa2dbfabca14f07af12663fc93c8dc3bc837cf (diff) | |
| download | samba-90bf114f6370ee837d97e36eb25f38f8234dcd39.tar.gz | |
pidl: Use a tmp_ctx helper variable
This is so we free the ndr_push_struct_blob() return value after
we make it into a string
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Diffstat (limited to 'pidl')
| -rw-r--r-- | pidl/lib/Parse/Pidl/Samba4/Python.pm | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm index 62de4870228..6488ac9c73b 100644 --- a/pidl/lib/Parse/Pidl/Samba4/Python.pm +++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm @@ -269,17 +269,28 @@ sub PythonStruct($$$$$$) $self->pidl("{"); $self->indent; $self->pidl("$cname *object = ($cname *)pytalloc_get_ptr(py_obj);"); + $self->pidl("PyObject *ret = NULL;"); $self->pidl("DATA_BLOB blob;"); $self->pidl("enum ndr_err_code err;"); - $self->pidl("err = ndr_push_struct_blob(&blob, pytalloc_get_mem_ctx(py_obj), object, (ndr_push_flags_fn_t)ndr_push_$name);"); + $self->pidl("TALLOC_CTX *tmp_ctx = talloc_new(pytalloc_get_mem_ctx(py_obj));"); + $self->pidl("if (tmp_ctx == NULL) {"); + $self->indent; + $self->pidl("PyErr_SetNdrError(NDR_ERR_ALLOC);"); + $self->pidl("return NULL;"); + $self->deindent; + $self->pidl("}"); + $self->pidl("err = ndr_push_struct_blob(&blob, tmp_ctx, object, (ndr_push_flags_fn_t)ndr_push_$name);"); $self->pidl("if (err != NDR_ERR_SUCCESS) {"); $self->indent; + $self->pidl("TALLOC_FREE(tmp_ctx);"); $self->pidl("PyErr_SetNdrError(err);"); $self->pidl("return NULL;"); $self->deindent; $self->pidl("}"); $self->pidl(""); - $self->pidl("return PyString_FromStringAndSize((char *)blob.data, blob.length);"); + $self->pidl("ret = PyString_FromStringAndSize((char *)blob.data, blob.length);"); + $self->pidl("TALLOC_FREE(tmp_ctx);"); + $self->pidl("return ret;"); $self->deindent; $self->pidl("}"); $self->pidl(""); |