diff options
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/util.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index 3d875c72b3..d25ee6652f 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -1608,8 +1608,9 @@ int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) { return -ETIMEDOUT; } + errno = 0; if (!fgets(line, sizeof(line), f)) - return -EIO; + return errno ? -errno : -EIO; truncate_nl(line); @@ -5355,6 +5356,9 @@ bool string_is_safe(const char *p) { if (*t > 0 && *t < ' ') return false; + if (*t == 127) + return false; + if (strchr("\\\"\'", *t)) return false; } @@ -5371,10 +5375,14 @@ bool string_has_cc(const char *p) { assert(p); - for (t = p; *t; t++) + for (t = p; *t; t++) { if (*t > 0 && *t < ' ' && *t != '\t') return true; + if (*t == 127) + return true; + } + return false; } |