]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
python3: Handle invalid global config keys
authorStéphane Graber <stgraber@ubuntu.com>
Sun, 25 May 2014 14:33:37 +0000 (16:33 +0200)
committerStéphane Graber <stgraber@ubuntu.com>
Tue, 3 Jun 2014 15:31:31 +0000 (11:31 -0400)
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
src/python-lxc/lxc.c

index d436c284625448a1ebcaf32b2f8f4871b8ffb412..a8ab65b27cec67977f36f6bc2999f0604b1381f2 100644 (file)
@@ -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 *