Keyboard.c: fix: handle empty string

bbe2c2ab · Ulrich Sibiller · Mike Gabriel · cf24c658 · bbe2c2ab
Commit bbe2c2ab authored Jan 02, 2020 by Ulrich Sibiller Committed by Mike Gabriel Jan 05, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

Keyboard.c nx-X11/programs/Xserver/hw/nxagent/Keyboard.c +6 -0

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Keyboard.c
@@ -549,6 +549,12 @@ XkbError:
        XkbComponentNamesRec names = {0};
        char *rules = NULL, *variant = NULL, *options = NULL; /* use xkb default */

+	/* handle empty string like the NULL pointer */
+	if (nxagentKeyboard && nxagentKeyboard[0] == '\0')
+	{
+	  SAFE_free(nxagentKeyboard);
+	}
+
        #ifdef TEST
        fprintf(stderr, "nxagentKeyboardProc: Using XKB extension.\n");
        fprintf(stderr, "nxagentKeyboardProc: nxagentKeyboard is [%s].\n", nxagentKeyboard ? nxagentKeyboard : "NULL");