xserver: Branch 'master'

[GitLab Mirror]

 hw/kdrive/src/kinput.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c107ee41f91c0fac1768a95ff04cdaf3f43c3325
Author: Tamura Dai <kirinode0 at gmail.com>
Date:   Fri May 12 18:30:24 2023 +0900

    Xephyr: fix tiny memleak in KdParseKeyboard().
    
    ki->name has already initialized in KdNewKeyboard() with strdup().
    But initialized in KdParseKeyboard() again.
    
    Signed-off-by: Tamura Dai <kirinode0 at gmail.com>

diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 185a9a359..2eeec831d 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -940,6 +940,8 @@ KdParseKeyboard(const char *arg)
     if (!ki)
         return NULL;
 
+    if (ki->name)
+        free(ki->name);
     ki->name = strdup("Unknown KDrive Keyboard");
     ki->path = NULL;
     ki->driver = NULL;