2011-03-30 15:55:28

by Jan Beulich

[permalink] [raw]
Subject: [PATCH] fix interaction of kasprintf() and vsnprintf() when using %pV

Otherwise, the warning at the top of vsnprintf() gets triggered by
kvasprintf()'s first invocation (with NULL buffer and zero size) of
vsnprintf().

Signed-off-by: Jan Beulich <[email protected]>

---
lib/vsprintf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- 2.6.39-rc1/lib/vsprintf.c
+++ 2.6.39-rc1-kasprintf-no-warn/lib/vsprintf.c
@@ -898,7 +898,7 @@ char *pointer(const char *fmt, char *buf
case 'U':
return uuid_string(buf, end, ptr, spec, fmt);
case 'V':
- return buf + vsnprintf(buf, end - buf,
+ return buf + vsnprintf(buf, end > buf ? end - buf : 0,
((struct va_format *)ptr)->fmt,
*(((struct va_format *)ptr)->va));
case 'K':