lib: [io]_stream_unref(NULL) should be a no-op

diff --git a/src/lib/istream.c b/src/lib/istream.c
index cf5f81a382153b69f12b8cb65b3ff812b4f6a2ce..ffcf7b640e10babefab05408c544fc6f6aefc5e3 100644 (file)
--- a/src/lib/istream.c
+++ b/src/lib/istream.c
@@ -49,7 +49,12 @@ void i_stream_ref(struct istream *stream)
 
 void i_stream_unref(struct istream **stream)
 {
-       struct istream_private *_stream = (*stream)->real_stream;
+       struct istream_private *_stream;
+
+       if (*stream == NULL)
+               return;
+
+       _stream = (*stream)->real_stream;
 
        if (_stream->iostream.refcount == 1) {
                if (_stream->line_str != NULL)

diff --git a/src/lib/ostream.c b/src/lib/ostream.c
index 175e417b04ec6041807ee5132d436567b84477a0..abae3b07125ccfc781e1e2a0879bd796376fa2a5 100644 (file)
--- a/src/lib/ostream.c
+++ b/src/lib/ostream.c
@@ -75,7 +75,12 @@ void o_stream_ref(struct ostream *stream)
 
 void o_stream_unref(struct ostream **_stream)
 {
-       struct ostream *stream = *_stream;
+       struct ostream *stream;
+
+       if (*_stream == NULL)
+               return;
+
+       stream = *_stream;
 
        if (stream->real_stream->last_errors_not_checked &&
            !stream->real_stream->error_handling_disabled &&