summaryrefslogtreecommitdiffstats
path: root/winsup/mingw/mingwex/stdio/pformat.c
diff options
context:
space:
mode:
Diffstat (limited to 'winsup/mingw/mingwex/stdio/pformat.c')
-rw-r--r--winsup/mingw/mingwex/stdio/pformat.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/winsup/mingw/mingwex/stdio/pformat.c b/winsup/mingw/mingwex/stdio/pformat.c
index 82dbcd741..2e2411606 100644
--- a/winsup/mingw/mingwex/stdio/pformat.c
+++ b/winsup/mingw/mingwex/stdio/pformat.c
@@ -356,8 +356,10 @@ void __pformat_puts( const char *s, __pformat_t *stream )
* to the `__pformat()' output stream.
*
* This is implemented as a trivial call to `__pformat_putchars()',
- * passing the length of the input string as the character count.
+ * passing the length of the input string as the character count,
+ * (after first verifying that the input pointer is not NULL).
*/
+ if( s == NULL ) s = "(null)";
__pformat_putchars( s, strlen( s ), stream );
}
@@ -434,8 +436,10 @@ void __pformat_wcputs( const wchar_t *s, __pformat_t *stream )
* the input string, to the `__pformat()' output stream.
*
* This is implemented as a trivial call to `__pformat_wputchars()',
- * passing the length of the input string as the character count.
+ * passing the length of the input string as the character count,
+ * (after first verifying that the input pointer is not NULL).
*/
+ if( s == NULL ) s = L"(null)";
__pformat_wputchars( s, wcslen( s ), stream );
}