lib: fix snprintf() for UTF-16 strings

snprintf() must return the required buffer length.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 69b2f6a1adc1efb57735c1f6709593499c9c0aaa..fe06aa2d71178546f46d822faf3b481925a8529c 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -285,15 +285,25 @@ static __maybe_unused char *string16(char *buf, char *end, u16 *s,
        if (!(flags & LEFT))
                for (; len < field_width; --field_width)
                        ADDCH(buf, ' ');
-       for (i = 0; i < len && buf + utf16_utf8_strnlen(str, 1) <= end; ++i) {
+       if (buf < end)
+               *buf = 0;
+       for (i = 0; i < len; ++i) {
+               int slen = utf16_utf8_strnlen(str, 1);
                s32 s = utf16_get(&str);
 
                if (s < 0)
                        s = '?';
-               utf8_put(s, &buf);
+               if (buf + slen < end) {
+                       utf8_put(s, &buf);
+                       if (buf < end)
+                               *buf = 0;
+               } else {
+                       buf += slen;
+               }
        }
        for (; len < field_width; --field_width)
                ADDCH(buf, ' ');
+
        return buf;
 }