diff options
author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2019-07-09 09:44:12 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2019-07-22 22:20:25 +0000 |
commit | dc20e7c6df7a230c3b3cd9ae7de79e4cacc36eb4 (patch) | |
tree | 819f822a7d8dccc13ede9b9506fda192449bf91b /lib/talloc | |
parent | 4496e073cbd0f78bcaa2cf340336e1a14bd6e8e6 (diff) | |
download | samba-dc20e7c6df7a230c3b3cd9ae7de79e4cacc36eb4.tar.gz |
talloc: pytalloc_get_checked_type: survive non-talloc objects
If the python object is not a talloc object, we will end up
with a NULL pointer. We weren't checking for that properly
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib/talloc')
-rw-r--r-- | lib/talloc/pytalloc_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/talloc/pytalloc_util.c b/lib/talloc/pytalloc_util.c index 82b95e7f144..4193ca895ce 100644 --- a/lib/talloc/pytalloc_util.c +++ b/lib/talloc/pytalloc_util.c @@ -247,7 +247,7 @@ static void *_pytalloc_get_checked_type(PyObject *py_obj, const char *type_name, mem_ctx = _pytalloc_get_mem_ctx(py_obj); ptr = _pytalloc_get_ptr(py_obj); - if (mem_ctx != ptr) { + if (mem_ctx != ptr || ptr == NULL) { if (check_only) { return NULL; } |