xrdp_keyboard.ini : Provide defaults

matt335672 · matt335672 · commit 38b1d65956de · 2025-04-01T11:13:20.000+01:00
At present, in the unlikely event the xrdp_keyboard.ini file is damaged,
sensible defaults are not provided for the values in the [defaults]
section.
diff --git a/xrdp/lang.c b/xrdp/lang.c
@@ -700,9 +700,12 @@ xrdp_init_xkb_layout(struct xrdp_client_info *client_info)
 
         if (section_found == -1)
         {
-            g_memset(section_rdp_layouts, 0, sizeof(char) * 256);
-            g_memset(section_layouts_map, 0, sizeof(char) * 256);
             // read default section
+            strlcpy(section_rdp_layouts, "default_rdp_layouts",
+                    sizeof(section_rdp_layouts));
+            strlcpy(section_layouts_map, "default_layouts_map",
+                    sizeof(section_layouts_map));
+
             file_read_section(fd, "default", items, values);
             for (index = 0; index < items->count; index++)
             {

Original file line number	Diff line number	Diff line change
`@@ -700,9 +700,12 @@ xrdp_init_xkb_layout(struct xrdp_client_info *client_info)`
`700`	`700`
`701`	`701`	`if (section_found == -1)`
`702`	`702`	`{`
`703`		`- g_memset(section_rdp_layouts, 0, sizeof(char) * 256);`
`704`		`- g_memset(section_layouts_map, 0, sizeof(char) * 256);`
`705`	`703`	`// read default section`
	`704`	`+ strlcpy(section_rdp_layouts, "default_rdp_layouts",`
	`705`	`+ sizeof(section_rdp_layouts));`
	`706`	`+ strlcpy(section_layouts_map, "default_layouts_map",`
	`707`	`+ sizeof(section_layouts_map));`
	`708`	`+`
`706`	`709`	`file_read_section(fd, "default", items, values);`
`707`	`710`	`for (index = 0; index < items->count; index++)`
`708`	`711`	`{`