generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mprintf: allow %.s with data not being zero terminated

Browse Source 
If the precision is indeed shorter than the string, don't strlen() to
find the end because that's not how the precision operator works.

I also added a unit test for curl_msnprintf to make sure this works and
that the fix doesn't a few other basic use cases. I found a POSIX
compliance problem that I marked TODO in the unit test, and I figure we
need to add more tests in the future.

Reported-by: Török Edwin
This commit is contained in:
Daniel Stenberg
2014-05-04 23:37:24 +02:00
parent 312f36d453
commit 812da4190f
4 changed files with 126 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mprintf.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
* Copyright (C) 1999 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -804,11 +804,11 @@ static int dprintf_formatf(
len = 0;
}
}
else if(prec != -1)
len = (size_t)prec;
else
len = strlen(str);
if(prec != -1 && (size_t) prec < len)
len = (size_t)prec;
width -= (long)len;
if(p->flags & FLAGS_ALT)
@@ -818,7 +818,7 @@ static int dprintf_formatf(
while(width-- > 0)
OUTCHAR(' ');
while(len-- > 0)
while((len-- > 0) && *str)
OUTCHAR(*str++);
if(p->flags&FLAGS_LEFT)
while(width-- > 0)