efi_loader: FreePages() must fail with pages = 0

[J-u-boot.git] / lib / vsprintf.c

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index ef8b0b5989573cde3c35e35dc29d81c56e16f880..2403825dc98d9c0430eb5b76e8d0bbc83ae09440 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -274,28 +274,29 @@ static char *string(char *buf, char *end, char *s, int field_width,
        return buf;
 }
 
+/* U-Boot uses UTF-16 strings in the EFI context only. */
+#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD)
 static char *string16(char *buf, char *end, u16 *s, int field_width,
                int precision, int flags)
 {
-       u16 *str = s ? s : L"<NULL>";
-       int utf16_len = utf16_strnlen(str, precision);
-       u8 utf8[utf16_len * MAX_UTF8_PER_UTF16];
-       int utf8_len, i;
-
-       utf8_len = utf16_to_utf8(utf8, str, utf16_len) - utf8;
+       const u16 *str = s ? s : L"<NULL>";
+       ssize_t i, len = utf16_strnlen(str, precision);
 
        if (!(flags & LEFT))
-               while (utf8_len < field_width--)
+               for (; len < field_width; --field_width)
                        ADDCH(buf, ' ');
-       for (i = 0; i < utf8_len; ++i)
-               ADDCH(buf, utf8[i]);
-       while (utf8_len < field_width--)
+       for (i = 0; i < len && buf + utf16_utf8_strnlen(str, 1) <= end; ++i) {
+               s32 s = utf16_get(&str);
+
+               if (s < 0)
+                       s = '?';
+               utf8_put(s, &buf);
+       }
+       for (; len < field_width; --field_width)
                ADDCH(buf, ' ');
        return buf;
 }
 
-/* Device paths only exist in the EFI context. */
-#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD)
 static char *device_path_string(char *buf, char *end, void *dp, int field_width,
                                int precision, int flags)
 {
@@ -456,7 +457,6 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
                return device_path_string(buf, end, ptr, field_width,
                                          precision, flags);
 #endif
-#ifdef CONFIG_CMD_NET
        case 'a':
                flags |= SPECIAL | ZEROPAD;
 
@@ -468,6 +468,7 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
                        break;
                }
                break;
+#ifdef CONFIG_CMD_NET
        case 'm':
                flags |= SPECIAL;
                /* Fallthrough */
@@ -612,10 +613,14 @@ repeat:
                        continue;
 
                case 's':
-                       if (qualifier == 'l' && !IS_ENABLED(CONFIG_SPL_BUILD)) {
+/* U-Boot uses UTF-16 strings in the EFI context only. */
+#if CONFIG_IS_ENABLED(EFI_LOADER) && !defined(API_BUILD)
+                       if (qualifier == 'l') {
                                str = string16(str, end, va_arg(args, u16 *),
                                               field_width, precision, flags);
-                       } else {
+                       } else
+#endif
+                       {
                                str = string(str, end, va_arg(args, char *),
                                             field_width, precision, flags);
                        }