mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rcxml: add missing check for calibrationMatrix

Browse source
This commit is contained in:
SnowNF 2024-03-21 16:46:44 +08:00 • committed by Johan Malm
parent 91e3dc10e4
commit fe9af393b4
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/config/rcxml.c
View file

@ -617,7 +617,8 @@ fill_libinput_category(char *nodename, char *content)
current_libinput_category->have_calibration_matrix = true; current_libinput_category->have_calibration_matrix = true;
float *mat = current_libinput_category->calibration_matrix; float *mat = current_libinput_category->calibration_matrix;
gchar **elements = g_strsplit(content, " ", -1); gchar **elements = g_strsplit(content, " ", -1);
for (guint i = 0; elements[i]; ++i) { guint i = 0;
for (; elements[i]; ++i) {
char *end_str = NULL; char *end_str = NULL;
mat[i] = strtof(elements[i], &end_str); mat[i] = strtof(elements[i], &end_str);
if (errno == ERANGE || *end_str != '\0' || i == 6 || *elements[i] == '\0') { if (errno == ERANGE || *end_str != '\0' || i == 6 || *elements[i] == '\0') {
@ -629,6 +630,11 @@ fill_libinput_category(char *nodename, char *content)
break; break;
} }
} }
if (i != 6 && current_libinput_category->have_calibration_matrix) {
wlr_log(WLR_ERROR, "wrong number of calibration matrix elements,"
" expected 6, got %d", i);
current_libinput_category->have_calibration_matrix = false;
}
g_strfreev(elements); g_strfreev(elements);
} }
} }