1 files changed, 3 insertions, 0 deletions

diff --git a/kernel/debug/gdbstub.c b/kernel/debug/gdbstub.c
index 38573f35a5ad..19d9a578c753 100644
--- a/kernel/debug/gdbstub.c
+++ b/kernel/debug/gdbstub.c
@@ -783,7 +783,10 @@ static void gdb_cmd_query(struct kgdb_state *ks)
                         len = len / 2;
                         remcom_out_buffer[len++] = 0;
 
+                        kdb_common_init_state(ks);
                         kdb_parse(remcom_out_buffer);
+                        kdb_common_deinit_state();
+
                         strcpy(remcom_out_buffer, "OK");
                 }
                 break;