diff options
| author | Michael Brown | 2016-04-12 12:51:05 +0200 |
|---|---|---|
| committer | Michael Brown | 2016-04-12 12:53:06 +0200 |
| commit | cc8824ad4e9486b9fa64f1b1d078ff1963f71219 (patch) | |
| tree | 2b170bde860ac5b91d44ddb9ad6a4fcbe605810b /src | |
| parent | [test] Update snprintf_ok() to use okx() (diff) | |
| download | ipxe-cc8824ad4e9486b9fa64f1b1d078ff1963f71219.tar.gz ipxe-cc8824ad4e9486b9fa64f1b1d078ff1963f71219.tar.xz ipxe-cc8824ad4e9486b9fa64f1b1d078ff1963f71219.zip | |
[libc] Print "<NULL>" for wide-character NULL strings
The existing code intends to print NULL strings as "<NULL>" (for the
sake of debug messages), but the logic is incorrect when handling
wide-character strings. Fix the logic and add applicable unit tests.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/vsprintf.c | 6 | ||||
| -rw-r--r-- | src/tests/vsprintf_test.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/core/vsprintf.c b/src/core/vsprintf.c index cb3bec5d..9d3a97c2 100644 --- a/src/core/vsprintf.c +++ b/src/core/vsprintf.c @@ -257,11 +257,13 @@ size_t vcprintf ( struct printf_context *ctx, const char *fmt, va_list args ) { } else if ( *fmt == 's' ) { if ( length < &type_sizes[LONG_LEN] ) { ptr = va_arg ( args, char * ); + if ( ! ptr ) + ptr = "<NULL>"; } else { wptr = va_arg ( args, wchar_t * ); + if ( ! wptr ) + ptr = "<NULL>"; } - if ( ( ptr == NULL ) && ( wptr == NULL ) ) - ptr = "<NULL>"; } else if ( *fmt == 'p' ) { intptr_t ptrval; diff --git a/src/tests/vsprintf_test.c b/src/tests/vsprintf_test.c index ad732a0d..f388b3de 100644 --- a/src/tests/vsprintf_test.c +++ b/src/tests/vsprintf_test.c @@ -108,6 +108,10 @@ static void vsprintf_test_exec ( void ) { snprintf_ok ( 64, "PCI 00:1f.3", "PCI %02x:%02x.%x", 0x00, 0x1f, 0x03 ); snprintf_ok ( 64, "Region [1000000,3f000000)", "Region [%llx,%llx)", 0x1000000ULL, 0x3f000000ULL ); + + /* Null string (used for debug messages) */ + snprintf_ok ( 16, "<NULL>", "%s", ( ( char * ) NULL ) ); + snprintf_ok ( 16, "<NULL>", "%ls", ( ( wchar_t * ) NULL ) ); } /** vsprintf() self-test */ |