X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fstdio%2Fvfprintf.c;h=b5948bd2649677f1c0acfd4e292d9f8dec9484d0;hb=a4b51633cfdecf597c247afe028c08b520816590;hp=a3bf18dd8c6d4f4b1ef0702239664b74ca33e874;hpb=914949d321448bd2189bdcbce794dbae2c8ed16e;p=musl diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c index a3bf18dd..b5948bd2 100644 --- a/src/stdio/vfprintf.c +++ b/src/stdio/vfprintf.c @@ -1,4 +1,13 @@ #include "stdio_impl.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include /* Some useful macros */ @@ -189,6 +198,13 @@ static char *fmt_u(uintmax_t x, char *s) return s; } +/* Do not override this check. The floating point printing code below + * depends on the float.h constants being right. If they are wrong, it + * may overflow the stack. */ +#if LDBL_MANT_DIG == 53 +typedef char compiler_defines_long_double_incorrectly[9-(int)sizeof(long double)]; +#endif + static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t) { uint32_t big[(LDBL_MAX_EXP+LDBL_MANT_DIG)/9+1]; @@ -200,7 +216,7 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t) char ebuf0[3*sizeof(int)], *ebuf=&ebuf0[3*sizeof(int)], *estr; pl=1; - if (y<0 || 1/y<0) { + if (signbit(y)) { y=-y; } else if (fl & MARK_POS) { prefix+=3; @@ -319,7 +335,7 @@ static int fmt_fp(FILE *f, long double y, int w, int p, int fl, int t) if (j < 9*(z-r-1)) { uint32_t x; /* We avoid C's broken division of negative numbers */ - d = r + 1 + (j+9*LDBL_MAX_EXP)/9 - LDBL_MAX_EXP; + d = r + 1 + ((j+9*LDBL_MAX_EXP)/9 - LDBL_MAX_EXP); j += 9*LDBL_MAX_EXP; j %= 9; for (i=10, j++; j<9; i*=10, j++); @@ -430,7 +446,7 @@ static int getint(char **s) { static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, int *nl_type) { char *a, *z, *s=(char *)fmt; - unsigned l10n=0, litpct, fl; + unsigned l10n=0, fl; int w, p; union arg arg; int argpos; @@ -455,9 +471,7 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, /* Handle literal text and %% format specifiers */ for (a=s; *s && *s!='%'; s++); - litpct = strspn(s, "%")/2; /* Optimize %%%% runs */ - z = s+litpct; - s += 2*litpct; + for (z=s; s[0]=='%' && s[1]=='%'; z++, s+=2); l = z-a; if (f) out(f, a, l); if (l) continue; @@ -516,7 +530,6 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, /* Check validity of argument type (nl/normal) */ if (st==NOARG) { if (argpos>=0) return -1; - else if (!f) continue; } else { if (argpos>=0) nl_type[argpos]=st, arg=nl_arg[argpos]; else if (f) pop_arg(&arg, st, ap); @@ -638,7 +651,7 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, return 1; } -int vfprintf(FILE *f, const char *fmt, va_list ap) +int vfprintf(FILE *restrict f, const char *restrict fmt, va_list ap) { va_list ap2; int nl_type[NL_ARGMAX+1] = {0}; @@ -646,8 +659,12 @@ int vfprintf(FILE *f, const char *fmt, va_list ap) unsigned char internal_buf[80], *saved_buf = 0; int ret; + /* the copy allows passing va_list* even if va_list is an array */ va_copy(ap2, ap); - if (printf_core(0, fmt, &ap2, nl_arg, nl_type) < 0) return -1; + if (printf_core(0, fmt, &ap2, nl_arg, nl_type) < 0) { + va_end(ap2); + return -1; + } FLOCK(f); if (!f->buf_size) {