From 1b03969c7ce75d7d88fe88d25fa74febb89bea98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Sun, 25 May 2014 16:33:37 +0200 Subject: [PATCH] python3: Handle invalid global config keys MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber Acked-by: Serge E. Hallyn --- src/python-lxc/lxc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/python-lxc/lxc.c b/src/python-lxc/lxc.c index d436c2846..a8ab65b27 100644 --- a/src/python-lxc/lxc.c +++ b/src/python-lxc/lxc.c @@ -329,12 +329,20 @@ LXC_get_global_config_item(PyObject *self, PyObject *args, PyObject *kwds) { static char *kwlist[] = {"key", NULL}; char* key = NULL; + const char* value = NULL; if (! PyArg_ParseTupleAndKeywords(args, kwds, "s|", kwlist, &key)) return NULL; - return PyUnicode_FromString(lxc_get_global_config_item(key)); + value = lxc_get_global_config_item(key); + + if (!value) { + PyErr_SetString(PyExc_KeyError, "Invalid configuration key"); + return NULL; + } + + return PyUnicode_FromString(value); } static PyObject *