mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-11 08:21:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

config: fix assertion failure on <touch><deviceName>

Browse source 
When <touch><deviceName> is expressed as a child node rather than an
attribute, `content` in `fill_touch()` becomes NULL when the parser
reaches <deviceName>.
This commit is contained in:
tokyo4j 2024-08-18 12:18:41 +09:00
parent b667107d1a
commit a0a9f977b4
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/config/rcxml.c
View file

@ -545,7 +545,12 @@ fill_touch(char *nodename, char *content)
if (!strcasecmp(nodename, "touch")) { if (!strcasecmp(nodename, "touch")) {
current_touch = znew(*current_touch); current_touch = znew(*current_touch);
wl_list_append(&rc.touch_configs, &current_touch->link); wl_list_append(&rc.touch_configs, &current_touch->link);
} else if (!strcasecmp(nodename, "deviceName.touch")) { return;
} else if (!content) {
return;
}
if (!strcasecmp(nodename, "deviceName.touch")) {
current_touch->device_name = xstrdup(content); current_touch->device_name = xstrdup(content);
} else if (!strcasecmp(nodename, "mapToOutput.touch")) { } else if (!strcasecmp(nodename, "mapToOutput.touch")) {
current_touch->output_name = xstrdup(content); current_touch->output_name = xstrdup(content);