X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Futf8.c;h=8702ceb1b2f983b6a54e177f4191eac481885bf6;hp=9353559b76d1dc9b4212045565c57e229e7d0b16;hb=6357ac664c9ce8ae5b83bdb98011da24185e4efa;hpb=7e8185ef942de5acecfa4cda03d7d7711ddda992

diff --git a/src/shared/utf8.c b/src/shared/utf8.c
index 9353559b7..8702ceb1b 100644
--- a/src/shared/utf8.c
+++ b/src/shared/utf8.c
@@ -150,10 +150,12 @@ bool utf8_is_printable_newline(const char* str, size_t length, bool newline) {
                 int encoded_len, val;
 
                 encoded_len = utf8_encoded_valid_unichar((const char *) p);
-                val = utf8_encoded_to_unichar((const char*) p);
-
                 if (encoded_len < 0 ||
-                    val < 0 ||
+                    (size_t) encoded_len > length)
+                        return false;
+
+                val = utf8_encoded_to_unichar((const char*) p);
+                if (val < 0 ||
                     is_unicode_control(val) ||
                     (!newline && val == '\n'))
                         return false;