From 773b1484bebc045a27ca4c665f06a5f521a14bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Goddard=20Rosa?= Date: Mon, 14 Dec 2009 18:00:55 -0800 Subject: [PATCH] --- yaml --- r: 176364 b: refs/heads/master c: 0f4f81dce93774a447da3ceb98cce193ef84a3fa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/lib/vsprintf.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dce64526f645..331c22b535b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3768f0b1d18369bbb4ddc3adca791d26704e8047 +refs/heads/master: 0f4f81dce93774a447da3ceb98cce193ef84a3fa diff --git a/trunk/lib/vsprintf.c b/trunk/lib/vsprintf.c index 6438cd5599ee..e5ab51fc2d9e 100644 --- a/trunk/lib/vsprintf.c +++ b/trunk/lib/vsprintf.c @@ -546,12 +546,12 @@ static char *number(char *buf, char *end, unsigned long long num, return buf; } -static char *string(char *buf, char *end, char *s, struct printf_spec spec) +static char *string(char *buf, char *end, const char *s, struct printf_spec spec) { int len, i; if ((unsigned long)s < PAGE_SIZE) - s = ""; + s = "(null)"; len = strnlen(s, spec.precision); @@ -1498,7 +1498,7 @@ do { \ size_t len; if ((unsigned long)save_str > (unsigned long)-PAGE_SIZE || (unsigned long)save_str < PAGE_SIZE) - save_str = ""; + save_str = "(null)"; len = strlen(save_str); if (str + len + 1 < end) memcpy(str, save_str, len + 1);