diff options
| author | Tom Rini <[email protected]> | 2018-07-30 16:02:29 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2018-07-30 16:02:29 -0400 |
| commit | 406fd7e207d3593f150079514a371dccdc651ce7 (patch) | |
| tree | 005f94b428abc454efd05f56364ee052cb16ac39 /lib/vsprintf.c | |
| parent | 3a8c8bffd767abb350010f3892c0029c54cef725 (diff) | |
| parent | 0b8a88ab6aa24de0ef2bf1e8109409f71e770a8e (diff) | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2018-07-25
Highlights this time:
- Many small fixes to improve spec compatibility (found by SCT)
- Almost enough to run with sandbox target
- GetTime() improvements
- Enable EFI_LOADER and HYP entry on ARMv7 with NONSEC=y
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 8b1b29fb5aa..914fbd30cbc 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -407,7 +407,10 @@ static char *uuid_string(char *buf, char *end, u8 *addr, int field_width, break; } - uuid_bin_to_str(addr, uuid, str_format); + if (addr) + uuid_bin_to_str(addr, uuid, str_format); + else + strcpy(uuid, "<NULL>"); return string(buf, end, uuid, field_width, precision, flags); } |