From ea522a3de7859e1a2f2685256ff4074fa7dc1c87 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Mon, 27 Jun 2011 17:34:01 +0100 Subject: xen.lowlevel.xl: Return None on empty domain name Previously PyString_FromString(NULL) was called, which caused assertion failure. Signed-off-by: Marek Marczykowski Acked-by: Ian Jackson Signed-off-by: Ian Jackson Committed-by: Ian Jackson --- tools/python/xen/lowlevel/xl/xl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools/python') 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; -- cgit v1.2.3