chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
persistent device naming: also read unpartitioned media
[elogind.git]
/
udev_utils_string.c
diff --git
a/udev_utils_string.c
b/udev_utils_string.c
index 6f51aef01417790988d55683fd1435796a128704..e3dc137e63257be33471a2d1a8ede3523a281dd4 100644
(file)
--- a/
udev_utils_string.c
+++ b/
udev_utils_string.c
@@
-216,8
+216,8
@@
int utf8_encoded_valid_unichar(const char *str)
return len;
}
return len;
}
-/*
replace everything but whitelisted plain ascii
and valid utf8 */
-int replace_
untrusted_chars(char *str
)
+/*
allow chars in whitelist, plain ascii, hex-escaping
and valid utf8 */
+int replace_
chars(char *str, const char *white
)
{
size_t i = 0;
int replaced = 0;
{
size_t i = 0;
int replaced = 0;
@@
-225,37
+225,42
@@
int replace_untrusted_chars(char *str)
while (str[i] != '\0') {
int len;
while (str[i] != '\0') {
int len;
- /* valid printable ascii char */
+ /* accept whitelist */
+ if (white != NULL && strchr(white, str[i]) != NULL) {
+ i++;
+ continue;
+ }
+
+ /* accept plain ascii char */
if ((str[i] >= '0' && str[i] <= '9') ||
(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])) {
+ (str[i] >= 'a' && str[i] <= 'z')) {
i++;
continue;
}
i++;
continue;
}
- /* hex encoding */
+ /*
accept
hex encoding */
if (str[i] == '\\' && str[i+1] == 'x') {
i += 2;
continue;
}
if (str[i] == '\\' && str[i+1] == 'x') {
i += 2;
continue;
}
- /*
valid utf8 is accepted
*/
+ /*
accept valid utf8
*/
len = utf8_encoded_valid_unichar(&str[i]);
if (len > 1) {
i += len;
continue;
}
len = utf8_encoded_valid_unichar(&str[i]);
if (len > 1) {
i += len;
continue;
}
- /*
whitespace replaced
with ordinary space */
- if (isspace(str[i])) {
+ /*
if space is allowed, replace whitespace
with ordinary space */
+ if (isspace(str[i])
&& strchr(white, ' ') != NULL
) {
str[i] = ' ';
i++;
replaced++;
continue;
}
str[i] = ' ';
i++;
replaced++;
continue;
}
- /* everything else is
garbage
*/
+ /* everything else is
replaced with '_'
*/
str[i] = '_';
i++;
replaced++;
str[i] = '_';
i++;
replaced++;