shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-12 09:17:44 +03:00
Code

util: consider 0x7F a control chracter (which it is: DEL)

Browse Source 
Let's better be safe than sorry.
This commit is contained in:
Lennart Poettering 2014-07-07 11:47:10 +02:00
parent a669ea9860
commit 3a8a916338
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/shared/util.c
View File

@ -1608,8 +1608,9 @@ int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) {
return -ETIMEDOUT; return -ETIMEDOUT;
} }
errno = 0;
if (!fgets(line, sizeof(line), f)) if (!fgets(line, sizeof(line), f))
return -EIO; return errno ? -errno : -EIO;
truncate_nl(line); truncate_nl(line);
@ -5355,6 +5356,9 @@ bool string_is_safe(const char *p) {
if (*t > 0 && *t < ' ') if (*t > 0 && *t < ' ')
return false; return false;
if (*t == 127)
return false;
if (strchr("\\\"\'", *t)) if (strchr("\\\"\'", *t))
return false; return false;
} }
@ -5371,10 +5375,14 @@ bool string_has_cc(const char *p) {
assert(p); assert(p);
for (t = p; *t; t++) for (t = p; *t; t++) {
if (*t > 0 && *t < ' ' && *t != '\t') if (*t > 0 && *t < ' ' && *t != '\t')
return true; return true;
if (*t == 127)
return true;
}
return false; return false;
} }