replace_untrusted_chars: replace all whitespace with space

diff --git a/udev_utils_string.c b/udev_utils_string.c
index 38b91aa0bd030ae8f3abb6f4561ab4e5bcf08cf3..6f51aef01417790988d55683fd1435796a128704 100644 (file)
--- a/udev_utils_string.c
+++ b/udev_utils_string.c
@@ -229,15 +229,17 @@ int replace_untrusted_chars(char *str)
                if ((str[i] >= '0' && str[i] <= '9') ||
                    (str[i] >= 'A' && str[i] <= 'Z') ||
                    (str[i] >= 'a' && str[i] <= 'z') ||
                if ((str[i] >= '0' && str[i] <= '9') ||
                    (str[i] >= 'A' && str[i] <= 'Z') ||
                    (str[i] >= 'a' && str[i] <= 'z') ||

-                   strchr(" #$%+-./:=?@_,", str[i])) {
+                   strchr("#$%+-./:=?@_,", str[i])) {

                        i++;
                        continue;
                }
                        i++;
                        continue;
                }

+

                /* hex encoding */
                if (str[i] == '\\' && str[i+1] == 'x') {
                        i += 2;
                        continue;
                }
                /* hex encoding */
                if (str[i] == '\\' && str[i+1] == 'x') {
                        i += 2;
                        continue;
                }

+

                /* valid utf8 is accepted */
                len = utf8_encoded_valid_unichar(&str[i]);
                if (len > 1) {
                /* valid utf8 is accepted */
                len = utf8_encoded_valid_unichar(&str[i]);
                if (len > 1) {


@@ -245,6 +247,14 @@ int replace_untrusted_chars(char *str)
                        continue;
                }
 
                        continue;
                }
 

+               /* whitespace replaced with ordinary space */
+               if (isspace(str[i])) {
+                       str[i] = ' ';
+                       i++;
+                       replaced++;
+                       continue;
+               }
+

                /* everything else is garbage */
                str[i] = '_';
                i++;
                /* everything else is garbage */
                str[i] = '_';
                i++;