This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
Home Products Support Community News


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

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] [xen-unstable] xen.lowlevel.xl: Return None on empty domain name
From: Xen patchbot-unstable <patchbot@xxxxxxx>
Date: Tue, 28 Jun 2011 07:44:34 +0100
Delivery-date: Mon, 27 Jun 2011 23:51:48 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# 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

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);
     return ret;

Xen-changelog mailing list

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-changelog] [xen-unstable] xen.lowlevel.xl: Return None on empty domain name, Xen patchbot-unstable <=