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

Merge "Replace the bionic hack for a vfprintf leak with (roughly) the upstream fix."

Browse Source
This commit is contained in:
Elliott Hughes 2014-04-12 17:35:27 +00:00 committed by Gerrit Code Review
commit 28417eb9b5
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libc/stdio/vfprintf.c
View File

@ -146,6 +146,7 @@ __sbprintf(FILE *fp, const char *fmt, va_list ap)
#define DEFPREC 6 #define DEFPREC 6
static char *cvt(double, int, int, char *, int *, int, int *); static char *cvt(double, int, int, char *, int *, int, int *);
extern void freedtoa(char *);
static int exponent(char *, int, int); static int exponent(char *, int, int);
#else /* no FLOATING_POINT */ #else /* no FLOATING_POINT */
#define BUF 40 #define BUF 40
@ -201,7 +202,6 @@ __vfprintf(FILE *fp, const char *fmt0, __va_list ap)
int ch; /* character from fmt */ int ch; /* character from fmt */
int n, m, n2; /* handy integers (short term usage) */ int n, m, n2; /* handy integers (short term usage) */
char *cp; /* handy char pointer (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 */ struct __siov *iovp; /* for PRINT macro */
int flags; /* flags as above */ int flags; /* flags as above */
int ret; /* return value accumulator */ 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 expsize = 0; /* character count for expstr */
int ndig; /* actual number of digits returned by cvt */ int ndig; /* actual number of digits returned by cvt */
char expstr[7]; /* buffer for exponent string */ char expstr[7]; /* buffer for exponent string */
char *dtoaresult = NULL;
#endif #endif
uintmax_t _umax; /* integer arguments %[diouxX] */ uintmax_t _umax; /* integer arguments %[diouxX] */
@ -555,10 +556,10 @@ reswitch: switch (ch) {
break; break;
} }
if (dtoaresult != NULL) freedtoa(dtoaresult);
flags |= FPT; flags |= FPT;
cp = cvt(_double, prec, flags, &softsign, dtoaresult = cp = cvt(_double, prec, flags, &softsign,
&expt, ch, &ndig); &expt, ch, &ndig);
cp_free = cp;
if (ch == 'g' || ch == 'G') { if (ch == 'g' || ch == 'G') {
if (expt <= -4 || expt > prec) if (expt <= -4 || expt > prec)
ch = (ch == 'g') ? 'e' : 'E'; ch = (ch == 'g') ? 'e' : 'E';
@ -845,21 +846,14 @@ number: if ((dprec = prec) >= 0)
ret += width > realsz ? width : realsz; ret += width > realsz ? width : realsz;
FLUSH(); /* copy out the I/O vectors */ 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: done:
FLUSH(); FLUSH();
error: error:
#if 1 /* BIONIC: remove memory leak when printing doubles */ #ifdef FLOATING_POINT
if (cp_free) { if (dtoaresult != NULL) {
free(cp_free); freedtoa(dtoaresult);
cp_free = NULL; }
}
#endif #endif
if (argtable != NULL && argtable != statargtable) { if (argtable != NULL && argtable != statargtable) {
munmap(argtable, argtablesiz); munmap(argtable, argtablesiz);