aboutsummaryrefslogtreecommitdiffstats
path: root/tools/python
diff options
context:
space:
mode:
authorMarek Marczykowski <marmarek@mimuw.edu.pl>2011-06-27 17:34:01 +0100
committerMarek Marczykowski <marmarek@mimuw.edu.pl>2011-06-27 17:34:01 +0100
commitea522a3de7859e1a2f2685256ff4074fa7dc1c87 (patch)
treed3db7626d3faba25dc2d4e7aa1a19b5958d7c585 /tools/python
parentf5e5bc1bdf785732cea8aa2ffb1ce8fac22a0599 (diff)
downloadxen-ea522a3de7859e1a2f2685256ff4074fa7dc1c87.tar.gz
xen-ea522a3de7859e1a2f2685256ff4074fa7dc1c87.tar.bz2
xen-ea522a3de7859e1a2f2685256ff4074fa7dc1c87.zip
xen.lowlevel.xl: Return None on empty domain name
Previously PyString_FromString(NULL) was called, which caused assertion failure. Signed-off-by: Marek Marczykowski <marmarek@mimuw.edu.pl> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/python')
-rw-r--r--tools/python/xen/lowlevel/xl/xl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/python/xen/lowlevel/xl/xl.c b/tools/python/xen/lowlevel/xl/xl.c
index 051b5eb476..b33fb94526 100644
--- a/tools/python/xen/lowlevel/xl/xl.c
+++ b/tools/python/xen/lowlevel/xl/xl.c
@@ -409,13 +409,14 @@ static PyObject *pyxl_domid_to_name(XlObject *self, PyObject *args)
{
char *domname;
int domid;
- PyObject *ret;
+ PyObject *ret = Py_None;
if ( !PyArg_ParseTuple(args, "i", &domid) )
return NULL;
domname = libxl_domid_to_name(self->ctx, domid);
- ret = PyString_FromString(domname);
+ if (domname)
+ ret = PyString_FromString(domname);
free(domname);
return ret;