diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-12 17:35:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-12 17:35:27 +0000 |
| commit | 28417eb9b58ca666355f93e82dcad0df0d3466ce (patch) | |
| tree | 5a076fb31fb8f28d747da6bbdfd1eb12c840318e /libc | |
| parent | a0b3232161f6ad60be1a3c4d97044ac2bb14808c (diff) | |
| parent | 5eb670462ab9e7d8a6363861e063cad4b5dfe7d1 (diff) | |
| download | android_bionic-28417eb9b58ca666355f93e82dcad0df0d3466ce.tar.gz android_bionic-28417eb9b58ca666355f93e82dcad0df0d3466ce.tar.bz2 android_bionic-28417eb9b58ca666355f93e82dcad0df0d3466ce.zip | |
Merge "Replace the bionic hack for a vfprintf leak with (roughly) the upstream fix."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/stdio/vfprintf.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/libc/stdio/vfprintf.c b/libc/stdio/vfprintf.c index efc8fd002..d2c315daa 100644 --- a/libc/stdio/vfprintf.c +++ b/libc/stdio/vfprintf.c @@ -146,6 +146,7 @@ __sbprintf(FILE *fp, const char *fmt, va_list ap) #define DEFPREC 6 static char *cvt(double, int, int, char *, int *, int, int *); +extern void freedtoa(char *); static int exponent(char *, int, int); #else /* no FLOATING_POINT */ #define BUF 40 @@ -201,7 +202,6 @@ __vfprintf(FILE *fp, const char *fmt0, __va_list ap) int ch; /* character from fmt */ int n, m, n2; /* handy integers (short term usage) */ char *cp; /* handy char pointer (short term usage) */ - char *cp_free = NULL; /* BIONIC: copy of cp to be freed after usage */ struct __siov *iovp; /* for PRINT macro */ int flags; /* flags as above */ int ret; /* return value accumulator */ @@ -218,6 +218,7 @@ __vfprintf(FILE *fp, const char *fmt0, __va_list ap) int expsize = 0; /* character count for expstr */ int ndig; /* actual number of digits returned by cvt */ char expstr[7]; /* buffer for exponent string */ + char *dtoaresult = NULL; #endif uintmax_t _umax; /* integer arguments %[diouxX] */ @@ -555,10 +556,10 @@ reswitch: switch (ch) { break; } + if (dtoaresult != NULL) freedtoa(dtoaresult); flags |= FPT; - cp = cvt(_double, prec, flags, &softsign, + dtoaresult = cp = cvt(_double, prec, flags, &softsign, &expt, ch, &ndig); - cp_free = cp; if (ch == 'g' || ch == 'G') { if (expt <= -4 || expt > prec) ch = (ch == 'g') ? 'e' : 'E'; @@ -845,21 +846,14 @@ number: if ((dprec = prec) >= 0) ret += width > realsz ? width : realsz; FLUSH(); /* copy out the I/O vectors */ -#if 1 /* BIONIC: remove memory leak when printing doubles */ - if (cp_free) { - free(cp_free); - cp_free = NULL; - } -#endif } done: FLUSH(); error: -#if 1 /* BIONIC: remove memory leak when printing doubles */ - if (cp_free) { - free(cp_free); - cp_free = NULL; - } +#ifdef FLOATING_POINT + if (dtoaresult != NULL) { + freedtoa(dtoaresult); + } #endif if (argtable != NULL && argtable != statargtable) { munmap(argtable, argtablesiz); |