kunit: string-stream: Allow ERR_PTR to be passed to string_stream_destroy()
authorRichard Fitzgerald <rf@opensource.cirrus.com>
Mon, 30 Oct 2023 10:47:46 +0000 (10:47 +0000)
committerShuah Khan <skhan@linuxfoundation.org>
Mon, 18 Dec 2023 20:21:14 +0000 (13:21 -0700)
Check the stream pointer passed to string_stream_destroy() for
IS_ERR_OR_NULL() instead of only NULL.

Whatever alloc_string_stream() returns should be safe to pass
to string_stream_destroy(), and that will be an ERR_PTR.

It's obviously good practise and generally helpful to also check
for NULL pointers so that client cleanup code can call
string_stream_destroy() unconditionally - which could include
pointers that have never been set to anything and so are NULL.

Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: Rae Moar <rmoar@google.com>
Reviewed-by: David Gow <davidgow@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
lib/kunit/string-stream.c

index a6f3616c20486849c030d4817dd7310a5b97f59a..54f4fdcbfac87dcfc30b8c7da7cde62ff945ea02 100644 (file)
@@ -173,7 +173,7 @@ void string_stream_destroy(struct string_stream *stream)
 {
        KUNIT_STATIC_STUB_REDIRECT(string_stream_destroy, stream);
 
-       if (!stream)
+       if (IS_ERR_OR_NULL(stream))
                return;
 
        string_stream_clear(stream);