sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

pidl-python: cope with NULL pointers in more places

Browse Source 
NULL is converted to Py_None
This commit is contained in:
Andrew Tridgell 2010-08-28 22:00:21 +10:00
parent e7e39584a9
commit 58d92cefe2
3 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/talloc/pytalloc.c
View File

@ -106,5 +106,25 @@ static void py_cobject_talloc_free(void *ptr)
PyObject *PyCObject_FromTallocPtr(void *ptr)
{
if (ptr == NULL) {
Py_RETURN_NONE;
}
return PyCObject_FromVoidPtr(ptr, py_cobject_talloc_free);
}
PyObject *PyString_FromString_check_null(const char *ptr)
{
if (ptr == NULL) {
Py_RETURN_NONE;
}
return PyString_FromString(ptr);
}
PyObject *PyUnicode_Decode_check_null(const void *ptr, size_t len,
const char *charset, const char *options)
{
if (ptr == NULL) {
Py_RETURN_NONE;
}
return PyUnicode_Decode(ptr, len, charset, options);
}

4
lib/talloc/pytalloc.h
View File

@ -54,4 +54,8 @@ PyObject *py_talloc_default_repr(PyObject *py_obj);
PyObject *PyCObject_FromTallocPtr(void *);
PyObject *PyString_FromString_check_null(const char *ptr);
PyObject *PyUnicode_Decode_check_null(const void *ptr, size_t len,
const char *charset, const char *options);
#endif /* _PY_TALLOC_H_ */

14
pidl/lib/Parse/Pidl/Samba4/Python.pm
View File

@ -873,7 +873,7 @@ sub ConvertObjectFromPythonData($$$$$$;$)
my $ctype_name = $self->use_type_variable($ctype);
unless (defined ($ctype_name)) {
error($location, "Unable to determine origin of type `" . mapTypeName($ctype) . "'");
$self->pidl("PyErr_SetString(PyExc_TypeError, \"Can not convert C Type " . mapTypeName($ctype) . " to Python\");");
$self->pidl("PyErr_SetString(PyExc_TypeError, \"Can not convert C Type " . mapTypeName($ctype) . " from Python\");");
return;
}
$self->pidl("PY_CHECK_TYPE($ctype_name, $cvar, $fail);");
@ -895,12 +895,12 @@ sub ConvertObjectFromPythonData($$$$$$;$)
if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "ipv4address") {
$self->pidl("$target = PyString_AsString($cvar);");
return;
}
}
if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "dnsp_name") {
$self->pidl("$target = PyString_AsString($cvar);");
return;
}
}
if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "NTSTATUS") {
@ -1050,13 +1050,13 @@ sub ConvertScalarToPython($$$)
}
if (($ctypename eq "string" or $ctypename eq "nbt_string" or $ctypename eq "nbt_name" or $ctypename eq "wrepl_nbt_name")) {
return "PyString_FromString($cvar)";
return "PyString_FromString_check_null($cvar)";
}
# Not yet supported
if ($ctypename eq "string_array") { return "PyCObject_FromTallocPtr($cvar)"; }
if ($ctypename eq "ipv4address") { return "PyString_FromString($cvar)"; }
if ($ctypename eq "dnsp_name") { return "PyString_FromString($cvar)"; }
if ($ctypename eq "ipv4address") { return "PyString_FromString_check_null($cvar)"; }
if ($ctypename eq "dnsp_name") { return "PyString_FromString_check_null($cvar)"; }
if ($ctypename eq "pointer") {
return "PyCObject_FromTallocPtr($cvar)";
}
@ -1139,7 +1139,7 @@ sub ConvertObjectToPythonLevel($$$$$$)
if (is_charset_array($e, $l)) {
# FIXME: Use Unix charset setting rather than utf-8
$self->pidl("$py_var = PyUnicode_Decode($var_name, strlen($var_name), \"utf-8\", \"ignore\");");
$self->pidl("$py_var = PyUnicode_Decode_check_null($var_name, strlen($var_name), \"utf-8\", \"ignore\");");
} else {
die("No SIZE_IS for array $var_name") unless (defined($l->{SIZE_IS}));
my $length = $l->{SIZE_IS};