[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 5/9] json-lexer: make it safe to call destroy mul
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v3 5/9] json-lexer: make it safe to call destroy multiple times |
Date: |
Sat, 25 Aug 2018 15:57:20 +0200 |
We can easily avoid the burden of checking if the lexer was
initialized prior to calling destroy by the caller, let's do it.
This allows simplification in state tracking in the qmp-async RFC
series, the patch "qmp: add QmpSession" can call qmp_session_destroy()
multiple time, which in turns calls json_lexer_destroy().
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 e1745a3d95..39969047f4 100644
--- a/qobject/json-lexer.c
+++ b/qobject/json-lexer.c
@@ -351,5 +351,8 @@ void 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;
+ }
}
--
2.18.0.547.g1d89318c48
- [Qemu-devel] [PATCH v3 4/9] monitor: no need to save need_resume, (continued)
- [Qemu-devel] [PATCH v3 4/9] monitor: no need to save need_resume, Marc-André Lureau, 2018/08/25
- Re: [Qemu-devel] [PATCH v3 4/9] monitor: no need to save need_resume, Peter Xu, 2018/08/27
- Re: [Qemu-devel] [PATCH v3 4/9] monitor: no need to save need_resume, Markus Armbruster, 2018/08/28
- Re: [Qemu-devel] [PATCH v3 4/9] monitor: no need to save need_resume, Peter Xu, 2018/08/28
- Re: [Qemu-devel] [PATCH v3 4/9] monitor: no need to save need_resume, Markus Armbruster, 2018/08/29
- Re: [Qemu-devel] [PATCH v3 4/9] monitor: no need to save need_resume, Peter Xu, 2018/08/29
- Re: [Qemu-devel] [PATCH v3 4/9] monitor: no need to save need_resume, Markus Armbruster, 2018/08/29
- Re: [Qemu-devel] [PATCH v3 4/9] monitor: no need to save need_resume, Marc-André Lureau, 2018/08/29
- Re: [Qemu-devel] [PATCH v3 4/9] monitor: no need to save need_resume, Peter Xu, 2018/08/29
- Re: [Qemu-devel] [PATCH v3 4/9] monitor: no need to save need_resume, Markus Armbruster, 2018/08/30
[Qemu-devel] [PATCH v3 5/9] json-lexer: make it safe to call destroy multiple times,
Marc-André Lureau <=
[Qemu-devel] [PATCH v3 6/9] tests: add a few qmp tests, Marc-André Lureau, 2018/08/25
[Qemu-devel] [PATCH v3 8/9] qga: process_event() simplification, Marc-André Lureau, 2018/08/25
[Qemu-devel] [PATCH v3 7/9] tests: add a qmp success-response test, Marc-André Lureau, 2018/08/25
[Qemu-devel] [PATCH v3 9/9] qmp: common 'id' handling & make QGA conform to QMP spec, Marc-André Lureau, 2018/08/25
Re: [Qemu-devel] [PATCH v3 0/9] monitor: various code simplification and fixes, Markus Armbruster, 2018/08/28