[Xen-changelog] [xen-unstable] xen.lowlevel.xl: Return None on empty domain name

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Marek Marczykowski <marmarek@xxxxxxxxxxxx>
# Date 1309192441 -3600
# Node ID cc2f376d0cd97fdb2a3d5e363f728ddd0d025bd0
# Parent  ff8d170852b3ebcd6301547fb296073ee24de344
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@xxxxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r ff8d170852b3 -r cc2f376d0cd9 tools/python/xen/lowlevel/xl/xl.c
--- a/tools/python/xen/lowlevel/xl/xl.c Mon Jun 27 17:28:52 2011 +0100
+++ b/tools/python/xen/lowlevel/xl/xl.c Mon Jun 27 17:34:01 2011 +0100
@@ -409,13 +409,14 @@
 {
     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;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog