systemd-python: fix segfault on double close

diff --git a/TODO b/TODO
index 1cc69b901a7c023cb095dab3dd83345887c3c21d..4419582e254f191e0f157cf183b7ce6bb8e12daf 100644 (file)
--- a/TODO
+++ b/TODO
@@ -570,6 +570,8 @@ Features:
    - allow reading of only select fields in systemd.journal._reader.Reader
    - export sd_journal_test_cursor in systemd.journal._reader.Reader
    - export sd_journal_get_usage in systemd.journal._reader.Reader
    - allow reading of only select fields in systemd.journal._reader.Reader
    - export sd_journal_test_cursor in systemd.journal._reader.Reader
    - export sd_journal_get_usage in systemd.journal._reader.Reader

+   - add systemd.journal._reader._Reader.closed attribute (it can
+     be just "return self->j != NULL")

    - figure out a simple way to wait for journal events in a way that
      works with ^C
 
    - figure out a simple way to wait for journal events in a way that
      works with ^C
 

diff --git a/src/python-systemd/_reader.c b/src/python-systemd/_reader.c
index 52e6b1c7a527ca0acf4c66531facd2c58cc3000d..160ab69a3caa5c13f80f9e2bb10de0eeb1dbb8e3 100644 (file)
--- a/src/python-systemd/_reader.c
+++ b/src/python-systemd/_reader.c
@@ -171,6 +171,7 @@ PyDoc_STRVAR(Reader_close__doc__,
 static PyObject* Reader_close(Reader *self, PyObject *args)
 {
     sd_journal_close(self->j);
 static PyObject* Reader_close(Reader *self, PyObject *args)
 {
     sd_journal_close(self->j);

+    self->j = NULL;

     Py_RETURN_NONE;
 }
 
     Py_RETURN_NONE;
 }