diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-07-02 13:42:25 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-07-02 13:45:49 +0200 |
| commit | e0a33e7ba619eb44f732aaf23cb249fa43d0ce8d (patch) | |
| tree | dcd70f11ddc1382814ae10eb2f8586f3b637d5cf | |
| parent | fecc80c1ba2eed9dadb9a10c15508c356bcc5fc1 (diff) | |
util: when unescaping strings, don't allow smuggling in of additional NUL bytes
Better safe than sorry.
| -rw-r--r-- | src/shared/util.c | 12 | ||||
| -rw-r--r-- | src/test/test-util.c | 8 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index ceafa019a8..4ad3f203d7 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -1256,7 +1256,7 @@ char *cunescape_length_with_prefix(const char *s, size_t length, const char *pre a = unhexchar(f[1]); b = unhexchar(f[2]); - if (a < 0 || b < 0) { + if (a < 0 || b < 0 || (a == 0 && b == 0)) { /* Invalid escape code, let's take it literal then */ *(t++) = '\\'; *(t++) = 'x'; @@ -1283,7 +1283,7 @@ char *cunescape_length_with_prefix(const char *s, size_t length, const char *pre b = unoctchar(f[1]); c = unoctchar(f[2]); - if (a < 0 || b < 0 || c < 0) { + if (a < 0 || b < 0 || c < 0 || (a == 0 && b == 0 && c == 0)) { /* Invalid escape code, let's take it literal then */ *(t++) = '\\'; *(t++) = f[0]; @@ -1566,8 +1566,7 @@ int chvt(int vt) { int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) { struct termios old_termios, new_termios; - char c; - char line[LINE_MAX]; + char c, line[LINE_MAX]; assert(f); assert(ret); @@ -1604,9 +1603,10 @@ int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) { } } - if (t != (usec_t) -1) + if (t != (usec_t) -1) { if (fd_wait_for_event(fileno(f), POLLIN, t) <= 0) return -ETIMEDOUT; + } if (!fgets(line, sizeof(line), f)) return -EIO; @@ -1624,6 +1624,7 @@ int read_one_char(FILE *f, char *ret, usec_t t, bool *need_nl) { } int ask(char *ret, const char *replies, const char *text, ...) { + int r; assert(ret); assert(replies); @@ -1632,7 +1633,6 @@ int ask(char *ret, const char *replies, const char *text, ...) { for (;;) { va_list ap; char c; - int r; bool need_nl = true; if (on_tty()) diff --git a/src/test/test-util.c b/src/test/test-util.c index dbc7cfe397..44921bd156 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -297,14 +297,16 @@ static void test_undecchar(void) { static void test_cescape(void) { _cleanup_free_ char *escaped; - escaped = cescape("abc\\\"\b\f\n\r\t\v\a\003\177\234\313"); + + assert_se(escaped = cescape("abc\\\"\b\f\n\r\t\v\a\003\177\234\313")); assert_se(streq(escaped, "abc\\\\\\\"\\b\\f\\n\\r\\t\\v\\a\\003\\177\\234\\313")); } static void test_cunescape(void) { _cleanup_free_ char *unescaped; - unescaped = cunescape("abc\\\\\\\"\\b\\f\\a\\n\\r\\t\\v\\003\\177\\234\\313"); - assert_se(streq(unescaped, "abc\\\"\b\f\a\n\r\t\v\003\177\234\313")); + + assert_se(unescaped = cunescape("abc\\\\\\\"\\b\\f\\a\\n\\r\\t\\v\\003\\177\\234\\313\\000\\x00")); + assert_se(streq(unescaped, "abc\\\"\b\f\a\n\r\t\v\003\177\234\313\\000\\x00")); } static void test_foreach_word(void) { |