chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
04bf3c1
)
systemd-python: fix initialization of _Reader objects
author
Steven Hiscocks
<steven@hiscocks.me.uk>
Thu, 15 Aug 2013 16:50:32 +0000
(12:50 -0400)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Thu, 15 Aug 2013 16:59:36 +0000
(12:59 -0400)
https://bugzilla.redhat.com/show_bug.cgi?id=995575
src/python-systemd/_reader.c
patch
|
blob
|
history
diff --git
a/src/python-systemd/_reader.c
b/src/python-systemd/_reader.c
index a678f69318055c94b14179aa3f13a7771d5b1a21..3b1003ba71f99e5a621ac622b7ab7a370947d607 100644
(file)
--- a/
src/python-systemd/_reader.c
+++ b/
src/python-systemd/_reader.c
@@
-64,6
+64,10
@@
static PyStructSequence_Desc Monotonic_desc = {
};
#endif
+/**
+ * Convert a Python sequence object into a strv (char**), and
+ * None into a NULL pointer.
+ */
static int strv_converter(PyObject* obj, void *_result) {
char ***result = _result;
Py_ssize_t i, len;
@@
-73,6
+77,11
@@
static int strv_converter(PyObject* obj, void *_result) {
if (!obj)
goto cleanup;
+ if (obj == Py_None) {
+ *result = NULL;
+ return 1;
+ }
+
if (!PySequence_Check(obj))
return 0;