diff options
author | Marek Marczykowski <marmarek@mimuw.edu.pl> | 2011-06-05 16:53:03 +0200 |
---|---|---|
committer | Marek Marczykowski <marmarek@mimuw.edu.pl> | 2011-06-05 16:53:03 +0200 |
commit | e057bfa6c7fe3699722a0e629611d91c97eb80b4 (patch) | |
tree | a4bcc43ba489245f8a21756712b1514f8589d2ad | |
parent | e91e7706bf44c126b597e7d89c41a892081dce70 (diff) | |
download | xen-e057bfa6c7fe3699722a0e629611d91c97eb80b4.tar.gz xen-e057bfa6c7fe3699722a0e629611d91c97eb80b4.tar.bz2 xen-e057bfa6c7fe3699722a0e629611d91c97eb80b4.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>
xen-unstable changest: 23606:cc2f376d0cd9
Backport-requested-by: Marek Marczykowski <marmarek@mimuw.edu.pl>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r-- | tools/python/xen/lowlevel/xl/xl.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/python/xen/lowlevel/xl/xl.c b/tools/python/xen/lowlevel/xl/xl.c index 14ad809f0f..a637a65fb7 100644 --- a/tools/python/xen/lowlevel/xl/xl.c +++ b/tools/python/xen/lowlevel/xl/xl.c @@ -412,14 +412,16 @@ 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); - free(domname); + if (domname) { + ret = PyString_FromString(domname); + free(domname); + } return ret; } |