rcxml: add missing check for calibrationMatrix

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 58ebc87247efc456e1b18e3bd6edc61c0b4a24e8..994498c3f2d7225ae3c06a598465ac1c342419c7 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -617,7 +617,8 @@ 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);
-               for (guint i = 0; elements[i]; ++i) {
+               guint i = 0;
+               for (; elements[i]; ++i) {
                        char *end_str = NULL;
                        mat[i] = strtof(elements[i], &end_str);
                        if (errno == ERANGE || *end_str != '\0' || i == 6 || *elements[i] == '\0') {
@@ -629,6 +630,11 @@ fill_libinput_category(char *nodename, char *content)
                                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);
        }
 }