浏览代码

add printing of null %s arguments as "(null)" in wide printf

this is undefined, but supported in our implementation of the normal
printf, so for consistency the wide variant should support it too.
Rich Felker 10 年之前
父节点
当前提交
f8f565df46
共有 1 个文件被更改,包括 1 次插入0 次删除
  1. 1 0
      src/stdio/vfwprintf.c

+ 1 - 0
src/stdio/vfwprintf.c

@@ -296,6 +296,7 @@ static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
 		case 'm':
 			arg.p = strerror(errno);
 		case 's':
+			if (!arg.p) arg.p = "(null)";
 			bs = arg.p;
 			if (p<0) p = INT_MAX;
 			for (i=l=0; l<p && (i=mbtowc(&wc, bs, MB_LEN_MAX))>0; bs+=i, l++);