chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c85a9a1
)
device-nodes: minor simplifications
author
Lennart Poettering
<lennart@poettering.net>
Fri, 10 Apr 2015 12:43:37 +0000
(14:43 +0200)
committer
Sven Eden
<yamakuzure@gmx.net>
Tue, 14 Mar 2017 06:58:15 +0000
(07:58 +0100)
src/shared/device-nodes.c
patch
|
blob
|
history
diff --git
a/src/shared/device-nodes.c
b/src/shared/device-nodes.c
index 8751797f547b23ec986a2ee89c50227b8f0c3b08..9d5af72d27da107310a6ed07de90c19c1b0f9d2d 100644
(file)
--- a/
src/shared/device-nodes.c
+++ b/
src/shared/device-nodes.c
@@
-25,12
+25,14
@@
#include "utf8.h"
int whitelisted_char_for_devnode(char c, const char *white) {
#include "utf8.h"
int whitelisted_char_for_devnode(char c, const char *white) {
+
if ((c >= '0' && c <= '9') ||
(c >= 'A' && c <= 'Z') ||
(c >= 'a' && c <= 'z') ||
strchr("#+-.:=@_", c) != NULL ||
(white != NULL && strchr(white, c) != NULL))
return 1;
if ((c >= '0' && c <= '9') ||
(c >= 'A' && c <= 'Z') ||
(c >= 'a' && c <= 'z') ||
strchr("#+-.:=@_", c) != NULL ||
(white != NULL && strchr(white, c) != NULL))
return 1;
+
return 0;
}
return 0;
}
@@
-45,27
+47,34
@@
int encode_devnode_name(const char *str, char *str_enc, size_t len) {
seqlen = utf8_encoded_valid_unichar(&str[i]);
if (seqlen > 1) {
seqlen = utf8_encoded_valid_unichar(&str[i]);
if (seqlen > 1) {
+
if (len-j < (size_t)seqlen)
if (len-j < (size_t)seqlen)
- goto err;
+ return -EINVAL;
+
memcpy(&str_enc[j], &str[i], seqlen);
j += seqlen;
i += (seqlen-1);
memcpy(&str_enc[j], &str[i], seqlen);
j += seqlen;
i += (seqlen-1);
+
} else if (str[i] == '\\' || !whitelisted_char_for_devnode(str[i], NULL)) {
} else if (str[i] == '\\' || !whitelisted_char_for_devnode(str[i], NULL)) {
+
if (len-j < 4)
if (len-j < 4)
- goto err;
+ return -EINVAL;
+
sprintf(&str_enc[j], "\\x%02x", (unsigned char) str[i]);
j += 4;
sprintf(&str_enc[j], "\\x%02x", (unsigned char) str[i]);
j += 4;
+
} else {
if (len-j < 1)
} else {
if (len-j < 1)
- goto err;
+ return -EINVAL;
+
str_enc[j] = str[i];
j++;
}
}
str_enc[j] = str[i];
j++;
}
}
+
if (len-j < 1)
if (len-j < 1)
- goto err;
+ return -EINVAL;
+
str_enc[j] = '\0';
return 0;
str_enc[j] = '\0';
return 0;
-err:
- return -EINVAL;
}
}