Commit 15bf0000 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Shuah Khan
Browse files

kunit: string-stream: Allow ERR_PTR to be passed to string_stream_destroy() 



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: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Reviewed-by: default avatarRae Moar <rmoar@google.com>
Reviewed-by: default avatarDavid Gow <davidgow@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 37f0d37f

lib/kunit/string-stream.c

+1 −1
Original line number Diff line number Diff line
@@ -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);