summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-10-05 11:30:10 +0400
committerJens Axboe <jens.axboe@oracle.com>2009-10-05 11:30:10 +0400
commit5d13379a4dba717fb75b749acc0f928c2c02db17 (patch)
treeab5bf870206e6ea8e744390cdb37cb14f7e78257 /lib
parent08dc8726d4be85bca793141c827574fd32a681bb (diff)
parent374576a8b6f865022c0fd1ca62396889b23d66dd (diff)
downloadlinux-5d13379a4dba717fb75b749acc0f928c2c02db17.tar.xz
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'lib')
-rw-r--r--lib/vsprintf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index b91839e9e892..33bed5e67a21 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -1771,7 +1771,7 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
* advance both strings to next white space
*/
if (*fmt == '*') {
- while (!isspace(*fmt) && *fmt)
+ while (!isspace(*fmt) && *fmt != '%' && *fmt)
fmt++;
while (!isspace(*str) && *str)
str++;