mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix keyload load errors detected by unit testing

Browse Source 
The code to clear the memory for the key mappings was incorrect,
due to array type decaying to a pointer
This commit is contained in:
matt335672 2024-05-23 16:21:31 +01:00
parent 4d91771cac
commit 3d5c8822a1
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xrdp/lang.c
View File

@ -230,12 +230,14 @@ is_valid_unicode_char(const char *val, char32_t *chr)
}
/*****************************************************************************/
/**
* keymap must be cleared before calling this function
*/
static int
km_read_section(toml_table_t *tfile, const char *section_name,
struct xrdp_key_info *keymap)
{
toml_table_t *section = toml_table_in(tfile, section_name);
g_memset(keymap, '\0', sizeof(*keymap));
if (section == NULL)
{
@ -363,10 +365,13 @@ km_load_file(const char *filename, struct xrdp_keymap *keymap)
}
else
{
fclose(fp);
LOG(LOG_LEVEL_INFO, "Loading keymap file %s", filename);
fclose(fp);
/* read the keymaps */
/* Clear the whole keymap */
memset(keymap, 0, sizeof(*keymap));
/* read the keymap sections */
km_read_section(tfile, "noshift", keymap->keys_noshift);
km_read_section(tfile, "shift", keymap->keys_shift);
km_read_section(tfile, "altgr", keymap->keys_altgr);
@ -382,6 +387,11 @@ km_load_file(const char *filename, struct xrdp_keymap *keymap)
* area and copy it over */
struct xrdp_key_info keys_numlock[256];
int i;
for (i = XR_RDP_SCAN_MIN_NUMLOCK; i <= XR_RDP_SCAN_MAX_NUMLOCK; ++i)
{
keys_numlock[i].sym = 0;
keys_numlock[i].chr = 0;
}
km_read_section(tfile, "numlock", keys_numlock);
for (i = XR_RDP_SCAN_MIN_NUMLOCK; i <= XR_RDP_SCAN_MAX_NUMLOCK; ++i)
{