[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 08/38] json-lexer: make it safe to call multi
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH v3 08/38] json-lexer: make it safe to call multiple times |
Date: |
Thu, 05 Jul 2018 13:42:01 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
Marc-André Lureau <address@hidden> writes:
> We can easily avoid the burden of checking if the lexer was
> initialized prior to calling destroy by the caller, let's do it.
>
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
> qobject/json-lexer.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c
> index 980ba159d6..0eaba43a2c 100644
> --- a/qobject/json-lexer.c
> +++ b/qobject/json-lexer.c
> @@ -386,5 +386,8 @@ int json_lexer_flush(JSONLexer *lexer)
>
> void json_lexer_destroy(JSONLexer *lexer)
> {
> - g_string_free(lexer->token, true);
> + if (lexer->token) {
> + g_string_free(lexer->token, true);
> + lexer->token = NULL;
> + }
> }
Is this just on general principles[*], or does it enable simplifactions
later in this series?
[*] Write the destructor so that it just works on uninitialized,
all-zeroes objects, on partly initialized objects (constructor failed),
and on completely initialized objects (constructor succeeded).
- Re: [Qemu-devel] [PATCH v3 08/38] json-lexer: make it safe to call multiple times,
Markus Armbruster <=