Re: [PATCH v4 02/10] kunit: string-stream: Don't create a fragment for empty strings

David Gow
2023-08-15T09:18:21Z

[-- Attachment #1: Type: text/plain, Size: 1404 bytes --]

On Mon, 14 Aug 2023 at 21:23, Richard Fitzgerald
<rf@opensource.cirrus.com> wrote:
>
> If the result of the formatted string is an empty string just return
> instead of creating an empty fragment.
>
> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com>
> ---

Nice catch!

Reviewed-by: David Gow <davidgow@google.com>

Cheers,
-- David

> lib/kunit/string-stream.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c
> index cc32743c1171..ed24d86af9f5 100644
> --- a/lib/kunit/string-stream.c
> +++ b/lib/kunit/string-stream.c
> @@ -50,11 +50,17 @@ int string_stream_vadd(struct string_stream *stream,
> /* Make a copy because `vsnprintf` could change it */
> va_copy(args_for_counting, args);
>
> - /* Need space for null byte. */
> - len = vsnprintf(NULL, 0, fmt, args_for_counting) + 1;
> + /* Evaluate length of formatted string */
> + len = vsnprintf(NULL, 0, fmt, args_for_counting);
>
> va_end(args_for_counting);
>
> + if (len == 0)
> + return 0;
> +
> + /* Need space for null byte. */
> + len++;
> +
> frag_container = alloc_string_stream_fragment(stream->test,
> len,
> stream->gfp);
> --
> 2.30.2
>

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4003 bytes --]