AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 16:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tue Jul 25 09:14:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>

Browse Source 
* stdio/vfprintf.c (vfprintf): For %s with precision spec, use
 	memchr instead of strlen to limit search for NUL by precision.
This commit is contained in:
Roland McGrath 1995-07-25 14:47:53 +00:00
parent 51813e8065
commit 874f1b9bd8
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Jul 25 09:14:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* stdio/vfprintf.c (vfprintf): For %s with precision spec, use
memchr instead of strlen to limit search for NUL by precision.
Mon Jul 24 03:13:16 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> Mon Jul 24 03:13:16 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* sysdeps/posix/pathconf.c: New file. * sysdeps/posix/pathconf.c: New file.

23
stdio/vfprintf.c
View File

@ -531,13 +531,24 @@ vfprintf (s, format, ap)
len = 0; len = 0;
} }
} }
else else if (specs[cnt].info.prec != -1)
len = strlen (str); {
const char *end = memchr (str, '\0', specs[cnt].info.prec);
if (end)
len = end - str;
else
len = strlen (str);
}
else
{
len = strlen (str);
if (specs[cnt].info.prec != -1
&& (size_t) specs[cnt].info.prec < len)
/* Limit the length to the precision. */
len = specs[cnt].info.prec;
}
if (specs[cnt].info.prec != -1
&& (size_t) specs[cnt].info.prec < len)
/* Limit the length to the precision. */
len = specs[cnt].info.prec;
specs[cnt].info.width -= len; specs[cnt].info.width -= len;
if (!specs[cnt].info.left) if (!specs[cnt].info.left)