rcxml: improve parse calibrationMatrix

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index d96daf8abb093477c372b9178873da56907e6e68..58ebc87247efc456e1b18e3bd6edc61c0b4a24e8 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -617,13 +617,13 @@ fill_libinput_category(char *nodename, char *content)
                current_libinput_category->have_calibration_matrix = true;
                float *mat = current_libinput_category->calibration_matrix;
                gchar **elements = g_strsplit(content, " ", -1);
-               guint length = g_strv_length(elements);
-               for (guint i = 0; i < length; ++i) {
+               for (guint i = 0; elements[i]; ++i) {
                        char *end_str = NULL;
                        mat[i] = strtof(elements[i], &end_str);
-                       if (i == 6 || errno == ERANGE || !end_str) {
-                               wlr_log(WLR_ERROR,
-                                               "bad calibration matrix value, expect six floats");
+                       if (errno == ERANGE || *end_str != '\0' || i == 6 || *elements[i] == '\0') {
+                               wlr_log(WLR_ERROR, "invalid calibration matrix element"
+                                                                       " %s (index %d), expect six floats",
+                                                                       elements[i], i);
                                current_libinput_category->have_calibration_matrix = false;
                                errno = 0;
                                break;