|
|
|
/*
|
|
|
|
* Copyright (c) 1983, 1995, 1996 Eric P. Allman
|
|
|
|
* Copyright (c) 1988, 1993
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
* Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. Neither the name of the University nor the names of its contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*
|
|
|
|
* src/port/snprintf.c
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "c.h"
|
|
|
|
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <limits.h>
|
|
|
|
#include <math.h>
|
|
|
|
#ifndef WIN32
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
#endif
|
|
|
|
#include <sys/param.h>
|
|
|
|
|
Set snprintf.c's maximum number of NL arguments to be 31.
Previously, we used the platform's NL_ARGMAX if any, otherwise 16.
The trouble with this is that the platform value is hugely variable,
ranging from the POSIX-minimum 9 to as much as 64K on recent FreeBSD.
Values of more than a dozen or two have no practical use and slow down
the initialization of the argtypes array. Worse, they cause snprintf.c
to consume far more stack space than was the design intention, possibly
resulting in stack-overflow crashes.
Standardize on 31, which is comfortably more than we need (it looks like
no existing translatable message has more than about 10 parameters).
I chose that, not 32, to make the array sizes powers of 2, for some
possible small gain in speed of the memset.
The lack of reported crashes suggests that the set of platforms we
use snprintf.c on (in released branches) may have no overlap with
the set where NL_ARGMAX has unreasonably large values. But that's
not entirely clear, so back-patch to all supported branches.
Per report from Mateusz Guzik (via Thomas Munro).
Discussion: https://postgr.es/m/CAEepm=3VF=PUp2f8gU8fgZB22yPE_KBS0+e1AHAtQ=09schTHg@mail.gmail.com
7 years ago
|
|
|
/*
|
|
|
|
* We used to use the platform's NL_ARGMAX here, but that's a bad idea,
|
|
|
|
* first because the point of this module is to remove platform dependencies
|
|
|
|
* not perpetuate them, and second because some platforms use ridiculously
|
|
|
|
* large values, leading to excessive stack consumption in dopr().
|
|
|
|
*/
|
|
|
|
#define PG_NL_ARGMAX 31
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* SNPRINTF, VSNPRINTF and friends
|
|
|
|
*
|
|
|
|
* These versions have been grabbed off the net. They have been
|
|
|
|
* cleaned up to compile properly and support for most of the C99
|
|
|
|
* specification has been added. Remaining unimplemented features are:
|
|
|
|
*
|
|
|
|
* 1. No locale support: the radix character is always '.' and the '
|
|
|
|
* (single quote) format flag is ignored.
|
|
|
|
*
|
|
|
|
* 2. No support for the "%n" format specification.
|
|
|
|
*
|
|
|
|
* 3. No support for wide characters ("lc" and "ls" formats).
|
|
|
|
*
|
|
|
|
* 4. No support for "long double" ("Lf" and related formats).
|
|
|
|
*
|
|
|
|
* 5. Space and '#' flags are not implemented.
|
|
|
|
*
|
|
|
|
* In addition, we support some extensions over C99:
|
|
|
|
*
|
|
|
|
* 1. Argument order control through "%n$" and "*n$", as required by POSIX.
|
|
|
|
*
|
|
|
|
* 2. "%m" expands to the value of strerror(errno), where errno is the
|
|
|
|
* value that variable had at the start of the call. This is a glibc
|
|
|
|
* extension, but a very useful one.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Historically the result values of sprintf/snprintf varied across platforms.
|
|
|
|
* This implementation now follows the C99 standard:
|
|
|
|
*
|
|
|
|
* 1. -1 is returned if an error is detected in the format string, or if
|
|
|
|
* a write to the target stream fails (as reported by fwrite). Note that
|
|
|
|
* overrunning snprintf's target buffer is *not* an error.
|
|
|
|
*
|
|
|
|
* 2. For successful writes to streams, the actual number of bytes written
|
|
|
|
* to the stream is returned.
|
|
|
|
*
|
|
|
|
* 3. For successful sprintf/snprintf, the number of bytes that would have
|
|
|
|
* been written to an infinite-size buffer (excluding the trailing '\0')
|
|
|
|
* is returned. snprintf will truncate its output to fit in the buffer
|
|
|
|
* (ensuring a trailing '\0' unless count == 0), but this is not reflected
|
|
|
|
* in the function result.
|
|
|
|
*
|
|
|
|
* snprintf buffer overrun can be detected by checking for function result
|
|
|
|
* greater than or equal to the supplied count.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**************************************************************
|
|
|
|
* Original:
|
|
|
|
* Patrick Powell Tue Apr 11 09:48:21 PDT 1995
|
|
|
|
* A bombproof version of doprnt (dopr) included.
|
|
|
|
* Sigh. This sort of thing is always nasty do deal with. Note that
|
|
|
|
* the version here does not include floating point. (now it does ... tgl)
|
|
|
|
**************************************************************/
|
|
|
|
|
|
|
|
/* Prevent recursion */
|
|
|
|
#undef vsnprintf
|
|
|
|
#undef snprintf
|
|
|
|
#undef sprintf
|
|
|
|
#undef vfprintf
|
|
|
|
#undef fprintf
|
|
|
|
#undef printf
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Info about where the formatted output is going.
|
|
|
|
*
|
|
|
|
* dopr and subroutines will not write at/past bufend, but snprintf
|
|
|
|
* reserves one byte, ensuring it may place the trailing '\0' there.
|
|
|
|
*
|
|
|
|
* In snprintf, we use nchars to count the number of bytes dropped on the
|
|
|
|
* floor due to buffer overrun. The correct result of snprintf is thus
|
|
|
|
* (bufptr - bufstart) + nchars. (This isn't as inconsistent as it might
|
|
|
|
* seem: nchars is the number of emitted bytes that are not in the buffer now,
|
|
|
|
* either because we sent them to the stream or because we couldn't fit them
|
|
|
|
* into the buffer to begin with.)
|
|
|
|
*/
|
|
|
|
typedef struct
|
|
|
|
{
|
|
|
|
char *bufptr; /* next buffer output position */
|
|
|
|
char *bufstart; /* first buffer element */
|
|
|
|
char *bufend; /* last+1 buffer element, or NULL */
|
|
|
|
/* bufend == NULL is for sprintf, where we assume buf is big enough */
|
|
|
|
FILE *stream; /* eventual output destination, or NULL */
|
|
|
|
int nchars; /* # chars sent to stream, or dropped */
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
bool failed; /* call is a failure; errno is set */
|
|
|
|
} PrintfTarget;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Info about the type and value of a formatting parameter. Note that we
|
|
|
|
* don't currently support "long double", "wint_t", or "wchar_t *" data,
|
|
|
|
* nor the '%n' formatting code; else we'd need more types. Also, at this
|
|
|
|
* level we need not worry about signed vs unsigned values.
|
|
|
|
*/
|
|
|
|
typedef enum
|
|
|
|
{
|
|
|
|
ATYPE_NONE = 0,
|
|
|
|
ATYPE_INT,
|
|
|
|
ATYPE_LONG,
|
|
|
|
ATYPE_LONGLONG,
|
|
|
|
ATYPE_DOUBLE,
|
|
|
|
ATYPE_CHARPTR
|
|
|
|
} PrintfArgType;
|
|
|
|
|
|
|
|
typedef union
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
long l;
|
|
|
|
int64 ll;
|
|
|
|
double d;
|
|
|
|
char *cptr;
|
|
|
|
} PrintfArgValue;
|
|
|
|
|
|
|
|
|
|
|
|
static void flushbuffer(PrintfTarget *target);
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
static void dopr(PrintfTarget *target, const char *format, va_list args);
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Externally visible entry points.
|
|
|
|
*
|
|
|
|
* All of these are just wrappers around dopr(). Note it's essential that
|
|
|
|
* they not change the value of "errno" before reaching dopr().
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args)
|
|
|
|
{
|
|
|
|
PrintfTarget target;
|
|
|
|
char onebyte[1];
|
|
|
|
|
|
|
|
/*
|
|
|
|
* C99 allows the case str == NULL when count == 0. Rather than
|
|
|
|
* special-casing this situation further down, we substitute a one-byte
|
|
|
|
* local buffer. Callers cannot tell, since the function result doesn't
|
|
|
|
* depend on count.
|
|
|
|
*/
|
|
|
|
if (count == 0)
|
|
|
|
{
|
|
|
|
str = onebyte;
|
|
|
|
count = 1;
|
|
|
|
}
|
|
|
|
target.bufstart = target.bufptr = str;
|
|
|
|
target.bufend = str + count - 1;
|
|
|
|
target.stream = NULL;
|
|
|
|
target.nchars = 0;
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
target.failed = false;
|
|
|
|
dopr(&target, fmt, args);
|
|
|
|
*(target.bufptr) = '\0';
|
|
|
|
return target.failed ? -1 : (target.bufptr - target.bufstart
|
|
|
|
+ target.nchars);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
pg_snprintf(char *str, size_t count, const char *fmt,...)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
|
|
len = pg_vsnprintf(str, count, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
Revert error-throwing wrappers for the printf family of functions.
This reverts commit 16304a013432931e61e623c8d85e9fe24709d9ba, except
for its changes in src/port/snprintf.c; as well as commit
cac18a76bb6b08f1ecc2a85e46c9d2ab82dd9d23 which is no longer needed.
Fujii Masao reported that the previous commit caused failures in psql on
OS X, since if one exits the pager program early while viewing a query
result, psql sees an EPIPE error from fprintf --- and the wrapper function
thought that was reason to panic. (It's a bit surprising that the same
does not happen on Linux.) Further discussion among the security list
concluded that the risk of other such failures was far too great, and
that the one-size-fits-all approach to error handling embodied in the
previous patch is unlikely to be workable.
This leaves us again exposed to the possibility of the type of failure
envisioned in CVE-2015-3166. However, that failure mode is strictly
hypothetical at this point: there is no concrete reason to believe that
an attacker could trigger information disclosure through the supposed
mechanism. In the first place, the attack surface is fairly limited,
since so much of what the backend does with format strings goes through
stringinfo.c or psprintf(), and those already had adequate defenses.
In the second place, even granting that an unprivileged attacker could
control the occurrence of ENOMEM with some precision, it's a stretch to
believe that he could induce it just where the target buffer contains some
valuable information. So we concluded that the risk of non-hypothetical
problems induced by the patch greatly outweighs the security risks.
We will therefore revert, and instead undertake closer analysis to
identify specific calls that may need hardening, rather than attempt a
universal solution.
We have kept the portion of the previous patch that improved snprintf.c's
handling of errors when it calls the platform's sprintf(). That seems to
be an unalloyed improvement.
Security: CVE-2015-3166
10 years ago
|
|
|
static int
|
|
|
|
pg_vsprintf(char *str, const char *fmt, va_list args)
|
|
|
|
{
|
|
|
|
PrintfTarget target;
|
|
|
|
|
|
|
|
target.bufstart = target.bufptr = str;
|
|
|
|
target.bufend = NULL;
|
|
|
|
target.stream = NULL;
|
|
|
|
target.nchars = 0; /* not really used in this case */
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
target.failed = false;
|
|
|
|
dopr(&target, fmt, args);
|
|
|
|
*(target.bufptr) = '\0';
|
|
|
|
return target.failed ? -1 : (target.bufptr - target.bufstart
|
|
|
|
+ target.nchars);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
pg_sprintf(char *str, const char *fmt,...)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
|
|
len = pg_vsprintf(str, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
pg_vfprintf(FILE *stream, const char *fmt, va_list args)
|
|
|
|
{
|
|
|
|
PrintfTarget target;
|
|
|
|
char buffer[1024]; /* size is arbitrary */
|
|
|
|
|
|
|
|
if (stream == NULL)
|
|
|
|
{
|
|
|
|
errno = EINVAL;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
target.bufstart = target.bufptr = buffer;
|
|
|
|
target.bufend = buffer + sizeof(buffer); /* use the whole buffer */
|
|
|
|
target.stream = stream;
|
|
|
|
target.nchars = 0;
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
target.failed = false;
|
|
|
|
dopr(&target, fmt, args);
|
|
|
|
/* dump any remaining buffer contents */
|
|
|
|
flushbuffer(&target);
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
return target.failed ? -1 : target.nchars;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
pg_fprintf(FILE *stream, const char *fmt,...)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
|
|
len = pg_vfprintf(stream, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
pg_printf(const char *fmt,...)
|
|
|
|
{
|
|
|
|
int len;
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
|
|
|
len = pg_vfprintf(stdout, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
/*
|
|
|
|
* Attempt to write the entire buffer to target->stream; discard the entire
|
|
|
|
* buffer in any case. Call this only when target->stream is defined.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
flushbuffer(PrintfTarget *target)
|
|
|
|
{
|
|
|
|
size_t nc = target->bufptr - target->bufstart;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't write anything if we already failed; this is to ensure we
|
|
|
|
* preserve the original failure's errno.
|
|
|
|
*/
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
if (!target->failed && nc > 0)
|
|
|
|
{
|
|
|
|
size_t written;
|
|
|
|
|
|
|
|
written = fwrite(target->bufstart, 1, nc, target->stream);
|
|
|
|
target->nchars += written;
|
|
|
|
if (written != nc)
|
|
|
|
target->failed = true;
|
|
|
|
}
|
|
|
|
target->bufptr = target->bufstart;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
static bool find_arguments(const char *format, va_list args,
|
|
|
|
PrintfArgValue *argvalues);
|
|
|
|
static void fmtstr(const char *value, int leftjust, int minlen, int maxwidth,
|
|
|
|
int pointflag, PrintfTarget *target);
|
|
|
|
static void fmtptr(void *value, PrintfTarget *target);
|
|
|
|
static void fmtint(int64 value, char type, int forcesign,
|
|
|
|
int leftjust, int minlen, int zpad, int precision, int pointflag,
|
|
|
|
PrintfTarget *target);
|
|
|
|
static void fmtchar(int value, int leftjust, int minlen, PrintfTarget *target);
|
|
|
|
static void fmtfloat(double value, char type, int forcesign,
|
|
|
|
int leftjust, int minlen, int zpad, int precision, int pointflag,
|
|
|
|
PrintfTarget *target);
|
|
|
|
static void dostr(const char *str, int slen, PrintfTarget *target);
|
|
|
|
static void dopr_outch(int c, PrintfTarget *target);
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
static void dopr_outchmulti(int c, int slen, PrintfTarget *target);
|
|
|
|
static int adjust_sign(int is_negative, int forcesign, int *signvalue);
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
static int compute_padlen(int minlen, int vallen, int leftjust);
|
|
|
|
static void leading_pad(int zpad, int signvalue, int *padlen,
|
|
|
|
PrintfTarget *target);
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
static void trailing_pad(int padlen, PrintfTarget *target);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If strchrnul exists (it's a glibc-ism), it's a good bit faster than the
|
|
|
|
* equivalent manual loop. If it doesn't exist, provide a replacement.
|
|
|
|
*
|
|
|
|
* Note: glibc declares this as returning "char *", but that would require
|
|
|
|
* casting away const internally, so we don't follow that detail.
|
|
|
|
*/
|
|
|
|
#ifndef HAVE_STRCHRNUL
|
|
|
|
|
|
|
|
static inline const char *
|
|
|
|
strchrnul(const char *s, int c)
|
|
|
|
{
|
|
|
|
while (*s != '\0' && *s != c)
|
|
|
|
s++;
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
/*
|
|
|
|
* glibc's <string.h> declares strchrnul only if _GNU_SOURCE is defined.
|
|
|
|
* While we typically use that on glibc platforms, configure will set
|
|
|
|
* HAVE_STRCHRNUL whether it's used or not. Fill in the missing declaration
|
|
|
|
* so that this file will compile cleanly with or without _GNU_SOURCE.
|
|
|
|
*/
|
|
|
|
#ifndef _GNU_SOURCE
|
|
|
|
extern char *strchrnul(const char *s, int c);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif /* HAVE_STRCHRNUL */
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* dopr(): the guts of *printf for all cases.
|
|
|
|
*/
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
static void
|
|
|
|
dopr(PrintfTarget *target, const char *format, va_list args)
|
|
|
|
{
|
|
|
|
int save_errno = errno;
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
const char *first_pct = NULL;
|
|
|
|
int ch;
|
|
|
|
bool have_dollar;
|
|
|
|
bool have_star;
|
|
|
|
bool afterstar;
|
|
|
|
int accum;
|
|
|
|
int longlongflag;
|
|
|
|
int longflag;
|
|
|
|
int pointflag;
|
|
|
|
int leftjust;
|
|
|
|
int fieldwidth;
|
|
|
|
int precision;
|
|
|
|
int zpad;
|
|
|
|
int forcesign;
|
|
|
|
int fmtpos;
|
|
|
|
int cvalue;
|
|
|
|
int64 numvalue;
|
|
|
|
double fvalue;
|
|
|
|
char *strvalue;
|
Set snprintf.c's maximum number of NL arguments to be 31.
Previously, we used the platform's NL_ARGMAX if any, otherwise 16.
The trouble with this is that the platform value is hugely variable,
ranging from the POSIX-minimum 9 to as much as 64K on recent FreeBSD.
Values of more than a dozen or two have no practical use and slow down
the initialization of the argtypes array. Worse, they cause snprintf.c
to consume far more stack space than was the design intention, possibly
resulting in stack-overflow crashes.
Standardize on 31, which is comfortably more than we need (it looks like
no existing translatable message has more than about 10 parameters).
I chose that, not 32, to make the array sizes powers of 2, for some
possible small gain in speed of the memset.
The lack of reported crashes suggests that the set of platforms we
use snprintf.c on (in released branches) may have no overlap with
the set where NL_ARGMAX has unreasonably large values. But that's
not entirely clear, so back-patch to all supported branches.
Per report from Mateusz Guzik (via Thomas Munro).
Discussion: https://postgr.es/m/CAEepm=3VF=PUp2f8gU8fgZB22yPE_KBS0+e1AHAtQ=09schTHg@mail.gmail.com
7 years ago
|
|
|
PrintfArgValue argvalues[PG_NL_ARGMAX + 1];
|
|
|
|
|
|
|
|
/*
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
* Initially, we suppose the format string does not use %n$. The first
|
|
|
|
* time we come to a conversion spec that has that, we'll call
|
|
|
|
* find_arguments() to check for consistent use of %n$ and fill the
|
|
|
|
* argvalues array with the argument values in the correct order.
|
|
|
|
*/
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
have_dollar = false;
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
while (*format != '\0')
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
/* Locate next conversion specifier */
|
|
|
|
if (*format != '%')
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
/* Scan to next '%' or end of string */
|
|
|
|
const char *next_pct = strchrnul(format + 1, '%');
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
/* Dump literal data we just scanned over */
|
|
|
|
dostr(format, next_pct - format, target);
|
|
|
|
if (target->failed)
|
|
|
|
break;
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
|
|
|
|
if (*next_pct == '\0')
|
|
|
|
break;
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
format = next_pct;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
* Remember start of first conversion spec; if we find %n$, then it's
|
|
|
|
* sufficient for find_arguments() to start here, without rescanning
|
|
|
|
* earlier literal text.
|
|
|
|
*/
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
if (first_pct == NULL)
|
|
|
|
first_pct = format;
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
/* Process conversion spec starting at *format */
|
|
|
|
format++;
|
|
|
|
fieldwidth = precision = zpad = leftjust = forcesign = 0;
|
|
|
|
longflag = longlongflag = pointflag = 0;
|
|
|
|
fmtpos = accum = 0;
|
|
|
|
have_star = afterstar = false;
|
|
|
|
nextch2:
|
|
|
|
ch = *format++;
|
|
|
|
if (ch == '\0')
|
|
|
|
break; /* illegal, but we don't complain */
|
|
|
|
switch (ch)
|
|
|
|
{
|
|
|
|
case '-':
|
|
|
|
leftjust = 1;
|
|
|
|
goto nextch2;
|
|
|
|
case '+':
|
|
|
|
forcesign = 1;
|
|
|
|
goto nextch2;
|
|
|
|
case '0':
|
|
|
|
/* set zero padding if no nonzero digits yet */
|
|
|
|
if (accum == 0 && !pointflag)
|
|
|
|
zpad = '0';
|
|
|
|
/* FALL THRU */
|
|
|
|
case '1':
|
|
|
|
case '2':
|
|
|
|
case '3':
|
|
|
|
case '4':
|
|
|
|
case '5':
|
|
|
|
case '6':
|
|
|
|
case '7':
|
|
|
|
case '8':
|
|
|
|
case '9':
|
|
|
|
accum = accum * 10 + (ch - '0');
|
|
|
|
goto nextch2;
|
|
|
|
case '.':
|
|
|
|
if (have_star)
|
|
|
|
have_star = false;
|
|
|
|
else
|
|
|
|
fieldwidth = accum;
|
|
|
|
pointflag = 1;
|
|
|
|
accum = 0;
|
|
|
|
goto nextch2;
|
|
|
|
case '*':
|
|
|
|
if (have_dollar)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
/*
|
|
|
|
* We'll process value after reading n$. Note it's OK to
|
|
|
|
* assume have_dollar is set correctly, because in a valid
|
|
|
|
* format string the initial % must have had n$ if * does.
|
|
|
|
*/
|
|
|
|
afterstar = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* fetch and process value now */
|
|
|
|
int starval = va_arg(args, int);
|
|
|
|
|
|
|
|
if (pointflag)
|
|
|
|
{
|
|
|
|
precision = starval;
|
|
|
|
if (precision < 0)
|
|
|
|
{
|
|
|
|
precision = 0;
|
|
|
|
pointflag = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fieldwidth = starval;
|
|
|
|
if (fieldwidth < 0)
|
|
|
|
{
|
|
|
|
leftjust = 1;
|
|
|
|
fieldwidth = -fieldwidth;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
have_star = true;
|
|
|
|
accum = 0;
|
|
|
|
goto nextch2;
|
|
|
|
case '$':
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
/* First dollar sign? */
|
|
|
|
if (!have_dollar)
|
|
|
|
{
|
|
|
|
/* Yup, so examine all conversion specs in format */
|
|
|
|
if (!find_arguments(first_pct, args, argvalues))
|
|
|
|
goto bad_format;
|
|
|
|
have_dollar = true;
|
|
|
|
}
|
|
|
|
if (afterstar)
|
|
|
|
{
|
|
|
|
/* fetch and process star value */
|
|
|
|
int starval = argvalues[accum].i;
|
|
|
|
|
|
|
|
if (pointflag)
|
|
|
|
{
|
|
|
|
precision = starval;
|
|
|
|
if (precision < 0)
|
|
|
|
{
|
|
|
|
precision = 0;
|
|
|
|
pointflag = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fieldwidth = starval;
|
|
|
|
if (fieldwidth < 0)
|
|
|
|
{
|
|
|
|
leftjust = 1;
|
|
|
|
fieldwidth = -fieldwidth;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
afterstar = false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
fmtpos = accum;
|
|
|
|
accum = 0;
|
|
|
|
goto nextch2;
|
|
|
|
case 'l':
|
|
|
|
if (longflag)
|
|
|
|
longlongflag = 1;
|
|
|
|
else
|
|
|
|
longflag = 1;
|
|
|
|
goto nextch2;
|
|
|
|
case 'z':
|
|
|
|
#if SIZEOF_SIZE_T == 8
|
|
|
|
#ifdef HAVE_LONG_INT_64
|
|
|
|
longflag = 1;
|
|
|
|
#elif defined(HAVE_LONG_LONG_INT_64)
|
|
|
|
longlongflag = 1;
|
|
|
|
#else
|
|
|
|
#error "Don't know how to print 64bit integers"
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
/* assume size_t is same size as int */
|
|
|
|
#endif
|
|
|
|
goto nextch2;
|
|
|
|
case 'h':
|
|
|
|
case '\'':
|
|
|
|
/* ignore these */
|
|
|
|
goto nextch2;
|
|
|
|
case 'd':
|
|
|
|
case 'i':
|
|
|
|
if (!have_star)
|
|
|
|
{
|
|
|
|
if (pointflag)
|
|
|
|
precision = accum;
|
|
|
|
else
|
|
|
|
fieldwidth = accum;
|
|
|
|
}
|
|
|
|
if (have_dollar)
|
|
|
|
{
|
|
|
|
if (longlongflag)
|
|
|
|
numvalue = argvalues[fmtpos].ll;
|
|
|
|
else if (longflag)
|
|
|
|
numvalue = argvalues[fmtpos].l;
|
|
|
|
else
|
|
|
|
numvalue = argvalues[fmtpos].i;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (longlongflag)
|
|
|
|
numvalue = va_arg(args, int64);
|
|
|
|
else if (longflag)
|
|
|
|
numvalue = va_arg(args, long);
|
|
|
|
else
|
|
|
|
numvalue = va_arg(args, int);
|
|
|
|
}
|
|
|
|
fmtint(numvalue, ch, forcesign, leftjust, fieldwidth, zpad,
|
|
|
|
precision, pointflag, target);
|
|
|
|
break;
|
|
|
|
case 'o':
|
|
|
|
case 'u':
|
|
|
|
case 'x':
|
|
|
|
case 'X':
|
|
|
|
if (!have_star)
|
|
|
|
{
|
|
|
|
if (pointflag)
|
|
|
|
precision = accum;
|
|
|
|
else
|
|
|
|
fieldwidth = accum;
|
|
|
|
}
|
|
|
|
if (have_dollar)
|
|
|
|
{
|
|
|
|
if (longlongflag)
|
|
|
|
numvalue = (uint64) argvalues[fmtpos].ll;
|
|
|
|
else if (longflag)
|
|
|
|
numvalue = (unsigned long) argvalues[fmtpos].l;
|
|
|
|
else
|
|
|
|
numvalue = (unsigned int) argvalues[fmtpos].i;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (longlongflag)
|
|
|
|
numvalue = (uint64) va_arg(args, int64);
|
|
|
|
else if (longflag)
|
|
|
|
numvalue = (unsigned long) va_arg(args, long);
|
|
|
|
else
|
|
|
|
numvalue = (unsigned int) va_arg(args, int);
|
|
|
|
}
|
|
|
|
fmtint(numvalue, ch, forcesign, leftjust, fieldwidth, zpad,
|
|
|
|
precision, pointflag, target);
|
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
if (!have_star)
|
|
|
|
{
|
|
|
|
if (pointflag)
|
|
|
|
precision = accum;
|
|
|
|
else
|
|
|
|
fieldwidth = accum;
|
|
|
|
}
|
|
|
|
if (have_dollar)
|
|
|
|
cvalue = (unsigned char) argvalues[fmtpos].i;
|
|
|
|
else
|
|
|
|
cvalue = (unsigned char) va_arg(args, int);
|
|
|
|
fmtchar(cvalue, leftjust, fieldwidth, target);
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
if (!have_star)
|
|
|
|
{
|
|
|
|
if (pointflag)
|
|
|
|
precision = accum;
|
|
|
|
else
|
|
|
|
fieldwidth = accum;
|
|
|
|
}
|
|
|
|
if (have_dollar)
|
|
|
|
strvalue = argvalues[fmtpos].cptr;
|
|
|
|
else
|
|
|
|
strvalue = va_arg(args, char *);
|
|
|
|
/* Whine if someone tries to print a NULL string */
|
|
|
|
Assert(strvalue != NULL);
|
|
|
|
fmtstr(strvalue, leftjust, fieldwidth, precision, pointflag,
|
|
|
|
target);
|
|
|
|
break;
|
|
|
|
case 'p':
|
|
|
|
/* fieldwidth/leftjust are ignored ... */
|
|
|
|
if (have_dollar)
|
|
|
|
strvalue = argvalues[fmtpos].cptr;
|
|
|
|
else
|
|
|
|
strvalue = va_arg(args, char *);
|
|
|
|
fmtptr((void *) strvalue, target);
|
|
|
|
break;
|
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
case 'f':
|
|
|
|
case 'g':
|
|
|
|
case 'G':
|
|
|
|
if (!have_star)
|
|
|
|
{
|
|
|
|
if (pointflag)
|
|
|
|
precision = accum;
|
|
|
|
else
|
|
|
|
fieldwidth = accum;
|
|
|
|
}
|
|
|
|
if (have_dollar)
|
|
|
|
fvalue = argvalues[fmtpos].d;
|
|
|
|
else
|
|
|
|
fvalue = va_arg(args, double);
|
|
|
|
fmtfloat(fvalue, ch, forcesign, leftjust,
|
|
|
|
fieldwidth, zpad,
|
|
|
|
precision, pointflag,
|
|
|
|
target);
|
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
{
|
|
|
|
char errbuf[PG_STRERROR_R_BUFLEN];
|
|
|
|
const char *errm = strerror_r(save_errno,
|
|
|
|
errbuf, sizeof(errbuf));
|
|
|
|
|
|
|
|
dostr(errm, strlen(errm), target);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '%':
|
|
|
|
dopr_outch('%', target);
|
|
|
|
break;
|
|
|
|
}
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
|
|
|
|
/* Check for failure after each conversion spec */
|
|
|
|
if (target->failed)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
return;
|
|
|
|
|
|
|
|
bad_format:
|
|
|
|
errno = EINVAL;
|
|
|
|
target->failed = true;
|
|
|
|
}
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
/*
|
|
|
|
* find_arguments(): sort out the arguments for a format spec with %n$
|
|
|
|
*
|
|
|
|
* If format is valid, return true and fill argvalues[i] with the value
|
|
|
|
* for the conversion spec that has %i$ or *i$. Else return false.
|
|
|
|
*/
|
|
|
|
static bool
|
|
|
|
find_arguments(const char *format, va_list args,
|
|
|
|
PrintfArgValue *argvalues)
|
|
|
|
{
|
|
|
|
int ch;
|
|
|
|
bool afterstar;
|
|
|
|
int accum;
|
|
|
|
int longlongflag;
|
|
|
|
int longflag;
|
|
|
|
int fmtpos;
|
|
|
|
int i;
|
|
|
|
int last_dollar;
|
|
|
|
PrintfArgType argtypes[PG_NL_ARGMAX + 1];
|
|
|
|
|
|
|
|
/* Initialize to "no dollar arguments known" */
|
|
|
|
last_dollar = 0;
|
|
|
|
MemSet(argtypes, 0, sizeof(argtypes));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This loop must accept the same format strings as the one in dopr().
|
|
|
|
* However, we don't need to analyze them to the same level of detail.
|
|
|
|
*
|
|
|
|
* Since we're only called if there's a dollar-type spec somewhere, we can
|
|
|
|
* fail immediately if we find a non-dollar spec. Per the C99 standard,
|
|
|
|
* all argument references in the format string must be one or the other.
|
|
|
|
*/
|
|
|
|
while (*format != '\0')
|
|
|
|
{
|
|
|
|
/* Locate next conversion specifier */
|
|
|
|
if (*format != '%')
|
|
|
|
{
|
|
|
|
/* Unlike dopr, we can just quit if there's no more specifiers */
|
|
|
|
format = strchr(format + 1, '%');
|
|
|
|
if (format == NULL)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Process conversion spec starting at *format */
|
|
|
|
format++;
|
|
|
|
longflag = longlongflag = 0;
|
|
|
|
fmtpos = accum = 0;
|
|
|
|
afterstar = false;
|
|
|
|
nextch1:
|
|
|
|
ch = *format++;
|
|
|
|
if (ch == '\0')
|
|
|
|
break; /* illegal, but we don't complain */
|
|
|
|
switch (ch)
|
|
|
|
{
|
|
|
|
case '-':
|
|
|
|
case '+':
|
|
|
|
goto nextch1;
|
|
|
|
case '0':
|
|
|
|
case '1':
|
|
|
|
case '2':
|
|
|
|
case '3':
|
|
|
|
case '4':
|
|
|
|
case '5':
|
|
|
|
case '6':
|
|
|
|
case '7':
|
|
|
|
case '8':
|
|
|
|
case '9':
|
|
|
|
accum = accum * 10 + (ch - '0');
|
|
|
|
goto nextch1;
|
|
|
|
case '.':
|
|
|
|
accum = 0;
|
|
|
|
goto nextch1;
|
|
|
|
case '*':
|
|
|
|
if (afterstar)
|
|
|
|
return false; /* previous star missing dollar */
|
|
|
|
afterstar = true;
|
|
|
|
accum = 0;
|
|
|
|
goto nextch1;
|
|
|
|
case '$':
|
|
|
|
if (accum <= 0 || accum > PG_NL_ARGMAX)
|
|
|
|
return false;
|
|
|
|
if (afterstar)
|
|
|
|
{
|
|
|
|
if (argtypes[accum] &&
|
|
|
|
argtypes[accum] != ATYPE_INT)
|
|
|
|
return false;
|
|
|
|
argtypes[accum] = ATYPE_INT;
|
|
|
|
last_dollar = Max(last_dollar, accum);
|
|
|
|
afterstar = false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
fmtpos = accum;
|
|
|
|
accum = 0;
|
|
|
|
goto nextch1;
|
|
|
|
case 'l':
|
|
|
|
if (longflag)
|
|
|
|
longlongflag = 1;
|
|
|
|
else
|
|
|
|
longflag = 1;
|
|
|
|
goto nextch1;
|
|
|
|
case 'z':
|
|
|
|
#if SIZEOF_SIZE_T == 8
|
|
|
|
#ifdef HAVE_LONG_INT_64
|
|
|
|
longflag = 1;
|
|
|
|
#elif defined(HAVE_LONG_LONG_INT_64)
|
|
|
|
longlongflag = 1;
|
|
|
|
#else
|
|
|
|
#error "Don't know how to print 64bit integers"
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
/* assume size_t is same size as int */
|
|
|
|
#endif
|
|
|
|
goto nextch1;
|
|
|
|
case 'h':
|
|
|
|
case '\'':
|
|
|
|
/* ignore these */
|
|
|
|
goto nextch1;
|
|
|
|
case 'd':
|
|
|
|
case 'i':
|
|
|
|
case 'o':
|
|
|
|
case 'u':
|
|
|
|
case 'x':
|
|
|
|
case 'X':
|
|
|
|
if (fmtpos)
|
|
|
|
{
|
|
|
|
PrintfArgType atype;
|
|
|
|
|
|
|
|
if (longlongflag)
|
|
|
|
atype = ATYPE_LONGLONG;
|
|
|
|
else if (longflag)
|
|
|
|
atype = ATYPE_LONG;
|
|
|
|
else
|
|
|
|
atype = ATYPE_INT;
|
|
|
|
if (argtypes[fmtpos] &&
|
|
|
|
argtypes[fmtpos] != atype)
|
|
|
|
return false;
|
|
|
|
argtypes[fmtpos] = atype;
|
|
|
|
last_dollar = Max(last_dollar, fmtpos);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return false; /* non-dollar conversion spec */
|
|
|
|
break;
|
|
|
|
case 'c':
|
|
|
|
if (fmtpos)
|
|
|
|
{
|
|
|
|
if (argtypes[fmtpos] &&
|
|
|
|
argtypes[fmtpos] != ATYPE_INT)
|
|
|
|
return false;
|
|
|
|
argtypes[fmtpos] = ATYPE_INT;
|
|
|
|
last_dollar = Max(last_dollar, fmtpos);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return false; /* non-dollar conversion spec */
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
case 'p':
|
|
|
|
if (fmtpos)
|
|
|
|
{
|
|
|
|
if (argtypes[fmtpos] &&
|
|
|
|
argtypes[fmtpos] != ATYPE_CHARPTR)
|
|
|
|
return false;
|
|
|
|
argtypes[fmtpos] = ATYPE_CHARPTR;
|
|
|
|
last_dollar = Max(last_dollar, fmtpos);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return false; /* non-dollar conversion spec */
|
|
|
|
break;
|
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
case 'f':
|
|
|
|
case 'g':
|
|
|
|
case 'G':
|
|
|
|
if (fmtpos)
|
|
|
|
{
|
|
|
|
if (argtypes[fmtpos] &&
|
|
|
|
argtypes[fmtpos] != ATYPE_DOUBLE)
|
|
|
|
return false;
|
|
|
|
argtypes[fmtpos] = ATYPE_DOUBLE;
|
|
|
|
last_dollar = Max(last_dollar, fmtpos);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return false; /* non-dollar conversion spec */
|
|
|
|
break;
|
|
|
|
case 'm':
|
|
|
|
case '%':
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we finish the spec with afterstar still set, there's a
|
|
|
|
* non-dollar star in there.
|
|
|
|
*/
|
|
|
|
if (afterstar)
|
|
|
|
return false; /* non-dollar conversion spec */
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Format appears valid so far, so collect the arguments in physical
|
|
|
|
* order. (Since we rejected any non-dollar specs that would have
|
|
|
|
* collected arguments, we know that dopr() hasn't collected any yet.)
|
|
|
|
*/
|
|
|
|
for (i = 1; i <= last_dollar; i++)
|
|
|
|
{
|
|
|
|
switch (argtypes[i])
|
|
|
|
{
|
|
|
|
case ATYPE_NONE:
|
|
|
|
return false;
|
|
|
|
case ATYPE_INT:
|
|
|
|
argvalues[i].i = va_arg(args, int);
|
|
|
|
break;
|
|
|
|
case ATYPE_LONG:
|
|
|
|
argvalues[i].l = va_arg(args, long);
|
|
|
|
break;
|
|
|
|
case ATYPE_LONGLONG:
|
|
|
|
argvalues[i].ll = va_arg(args, int64);
|
|
|
|
break;
|
|
|
|
case ATYPE_DOUBLE:
|
|
|
|
argvalues[i].d = va_arg(args, double);
|
|
|
|
break;
|
|
|
|
case ATYPE_CHARPTR:
|
|
|
|
argvalues[i].cptr = va_arg(args, char *);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
fmtstr(const char *value, int leftjust, int minlen, int maxwidth,
|
|
|
|
int pointflag, PrintfTarget *target)
|
|
|
|
{
|
|
|
|
int padlen,
|
|
|
|
vallen; /* amount to pad */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If a maxwidth (precision) is specified, we must not fetch more bytes
|
|
|
|
* than that.
|
|
|
|
*/
|
|
|
|
if (pointflag)
|
|
|
|
vallen = strnlen(value, maxwidth);
|
|
|
|
else
|
|
|
|
vallen = strlen(value);
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
padlen = compute_padlen(minlen, vallen, leftjust);
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
if (padlen > 0)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
dopr_outchmulti(' ', padlen, target);
|
|
|
|
padlen = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
dostr(value, vallen, target);
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
trailing_pad(padlen, target);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
fmtptr(void *value, PrintfTarget *target)
|
|
|
|
{
|
|
|
|
int vallen;
|
|
|
|
char convert[64];
|
|
|
|
|
|
|
|
/* we rely on regular C library's sprintf to do the basic conversion */
|
|
|
|
vallen = sprintf(convert, "%p", value);
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
if (vallen < 0)
|
|
|
|
target->failed = true;
|
|
|
|
else
|
|
|
|
dostr(convert, vallen, target);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
fmtint(int64 value, char type, int forcesign, int leftjust,
|
|
|
|
int minlen, int zpad, int precision, int pointflag,
|
|
|
|
PrintfTarget *target)
|
|
|
|
{
|
|
|
|
uint64 base;
|
|
|
|
int dosign;
|
|
|
|
const char *cvt = "0123456789abcdef";
|
|
|
|
int signvalue = 0;
|
|
|
|
char convert[64];
|
|
|
|
int vallen = 0;
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
int padlen; /* amount to pad */
|
|
|
|
int zeropad; /* extra leading zeroes */
|
|
|
|
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case 'd':
|
|
|
|
case 'i':
|
|
|
|
base = 10;
|
|
|
|
dosign = 1;
|
|
|
|
break;
|
|
|
|
case 'o':
|
|
|
|
base = 8;
|
|
|
|
dosign = 0;
|
|
|
|
break;
|
|
|
|
case 'u':
|
|
|
|
base = 10;
|
|
|
|
dosign = 0;
|
|
|
|
break;
|
|
|
|
case 'x':
|
|
|
|
base = 16;
|
|
|
|
dosign = 0;
|
|
|
|
break;
|
|
|
|
case 'X':
|
|
|
|
cvt = "0123456789ABCDEF";
|
|
|
|
base = 16;
|
|
|
|
dosign = 0;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return; /* keep compiler quiet */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Handle +/- */
|
|
|
|
if (dosign && adjust_sign((value < 0), forcesign, &signvalue))
|
|
|
|
value = -value;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* SUS: the result of converting 0 with an explicit precision of 0 is no
|
|
|
|
* characters
|
|
|
|
*/
|
|
|
|
if (value == 0 && pointflag && precision == 0)
|
|
|
|
vallen = 0;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* make integer string */
|
|
|
|
uint64 uvalue = (uint64) value;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
convert[sizeof(convert) - (++vallen)] = cvt[uvalue % base];
|
|
|
|
uvalue = uvalue / base;
|
|
|
|
} while (uvalue);
|
|
|
|
}
|
|
|
|
|
|
|
|
zeropad = Max(0, precision - vallen);
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
padlen = compute_padlen(minlen, vallen + zeropad, leftjust);
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
leading_pad(zpad, signvalue, &padlen, target);
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
if (zeropad > 0)
|
|
|
|
dopr_outchmulti('0', zeropad, target);
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
dostr(convert + sizeof(convert) - vallen, vallen, target);
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
trailing_pad(padlen, target);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
fmtchar(int value, int leftjust, int minlen, PrintfTarget *target)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
int padlen; /* amount to pad */
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
padlen = compute_padlen(minlen, 1, leftjust);
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
if (padlen > 0)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
dopr_outchmulti(' ', padlen, target);
|
|
|
|
padlen = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
dopr_outch(value, target);
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
trailing_pad(padlen, target);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
fmtfloat(double value, char type, int forcesign, int leftjust,
|
|
|
|
int minlen, int zpad, int precision, int pointflag,
|
|
|
|
PrintfTarget *target)
|
|
|
|
{
|
|
|
|
int signvalue = 0;
|
|
|
|
int prec;
|
|
|
|
int vallen;
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
char fmt[8];
|
|
|
|
char convert[1024];
|
|
|
|
int zeropadlen = 0; /* amount to pad with zeroes */
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
int padlen; /* amount to pad with spaces */
|
|
|
|
|
|
|
|
/* Handle sign (NaNs have no sign) */
|
|
|
|
if (!isnan(value) && adjust_sign((value < 0), forcesign, &signvalue))
|
|
|
|
value = -value;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We rely on the regular C library's sprintf to do the basic conversion,
|
|
|
|
* then handle padding considerations here.
|
|
|
|
*
|
|
|
|
* The dynamic range of "double" is about 1E+-308 for IEEE math, and not
|
|
|
|
* too wildly more than that with other hardware. In "f" format, sprintf
|
|
|
|
* could therefore generate at most 308 characters to the left of the
|
|
|
|
* decimal point; while we need to allow the precision to get as high as
|
|
|
|
* 308+17 to ensure that we don't truncate significant digits from very
|
|
|
|
* small values. To handle both these extremes, we use a buffer of 1024
|
|
|
|
* bytes and limit requested precision to 350 digits; this should prevent
|
|
|
|
* buffer overrun even with non-IEEE math. If the original precision
|
|
|
|
* request was more than 350, separately pad with zeroes.
|
|
|
|
*/
|
|
|
|
if (precision < 0) /* cover possible overflow of "accum" */
|
|
|
|
precision = 0;
|
|
|
|
prec = Min(precision, 350);
|
|
|
|
|
|
|
|
if (pointflag)
|
|
|
|
{
|
|
|
|
zeropadlen = precision - prec;
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
fmt[0] = '%';
|
|
|
|
fmt[1] = '.';
|
|
|
|
fmt[2] = '*';
|
|
|
|
fmt[3] = type;
|
|
|
|
fmt[4] = '\0';
|
|
|
|
vallen = sprintf(convert, fmt, prec, value);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fmt[0] = '%';
|
|
|
|
fmt[1] = type;
|
|
|
|
fmt[2] = '\0';
|
|
|
|
vallen = sprintf(convert, fmt, value);
|
|
|
|
}
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
if (vallen < 0)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
/* If it's infinity or NaN, forget about doing any zero-padding */
|
|
|
|
if (zeropadlen > 0 && !isdigit((unsigned char) convert[vallen - 1]))
|
|
|
|
zeropadlen = 0;
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
padlen = compute_padlen(minlen, vallen + zeropadlen, leftjust);
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
leading_pad(zpad, signvalue, &padlen, target);
|
|
|
|
|
|
|
|
if (zeropadlen > 0)
|
|
|
|
{
|
|
|
|
/* If 'e' or 'E' format, inject zeroes before the exponent */
|
|
|
|
char *epos = strrchr(convert, 'e');
|
|
|
|
|
|
|
|
if (!epos)
|
|
|
|
epos = strrchr(convert, 'E');
|
|
|
|
if (epos)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
/* pad before exponent */
|
|
|
|
dostr(convert, epos - convert, target);
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
if (zeropadlen > 0)
|
|
|
|
dopr_outchmulti('0', zeropadlen, target);
|
|
|
|
dostr(epos, vallen - (epos - convert), target);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* no exponent, pad after the digits */
|
|
|
|
dostr(convert, vallen, target);
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
if (zeropadlen > 0)
|
|
|
|
dopr_outchmulti('0', zeropadlen, target);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* no zero padding, just emit the number as-is */
|
|
|
|
dostr(convert, vallen, target);
|
|
|
|
}
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
trailing_pad(padlen, target);
|
Add error-throwing wrappers for the printf family of functions.
All known standard library implementations of these functions can fail
with ENOMEM. A caller neglecting to check for failure would experience
missing output, information exposure, or a crash. Check return values
within wrappers and code, currently just snprintf.c, that bypasses the
wrappers. The wrappers do not return after an error, so their callers
need not check. Back-patch to 9.0 (all supported versions).
Popular free software standard library implementations do take pains to
bypass malloc() in simple cases, but they risk ENOMEM for floating point
numbers, positional arguments, large field widths, and large precisions.
No specification demands such caution, so this commit regards every call
to a printf family function as a potential threat.
Injecting the wrappers implicitly is a compromise between patch scope
and design goals. I would prefer to edit each call site to name a
wrapper explicitly. libpq and the ECPG libraries would, ideally, convey
errors to the caller rather than abort(). All that would be painfully
invasive for a back-patched security fix, hence this compromise.
Security: CVE-2015-3166
10 years ago
|
|
|
return;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
target->failed = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dostr(const char *str, int slen, PrintfTarget *target)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
/* fast path for common case of slen == 1 */
|
|
|
|
if (slen == 1)
|
|
|
|
{
|
|
|
|
dopr_outch(*str, target);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (slen > 0)
|
|
|
|
{
|
|
|
|
int avail;
|
|
|
|
|
|
|
|
if (target->bufend != NULL)
|
|
|
|
avail = target->bufend - target->bufptr;
|
|
|
|
else
|
|
|
|
avail = slen;
|
|
|
|
if (avail <= 0)
|
|
|
|
{
|
|
|
|
/* buffer full, can we dump to stream? */
|
|
|
|
if (target->stream == NULL)
|
|
|
|
{
|
|
|
|
target->nchars += slen; /* no, lose the data */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
flushbuffer(target);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
avail = Min(avail, slen);
|
|
|
|
memmove(target->bufptr, str, avail);
|
|
|
|
target->bufptr += avail;
|
|
|
|
str += avail;
|
|
|
|
slen -= avail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dopr_outch(int c, PrintfTarget *target)
|
|
|
|
{
|
|
|
|
if (target->bufend != NULL && target->bufptr >= target->bufend)
|
|
|
|
{
|
|
|
|
/* buffer full, can we dump to stream? */
|
|
|
|
if (target->stream == NULL)
|
|
|
|
{
|
|
|
|
target->nchars++; /* no, lose the data */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
flushbuffer(target);
|
|
|
|
}
|
|
|
|
*(target->bufptr++) = c;
|
|
|
|
}
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
static void
|
|
|
|
dopr_outchmulti(int c, int slen, PrintfTarget *target)
|
|
|
|
{
|
|
|
|
/* fast path for common case of slen == 1 */
|
|
|
|
if (slen == 1)
|
|
|
|
{
|
|
|
|
dopr_outch(c, target);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (slen > 0)
|
|
|
|
{
|
|
|
|
int avail;
|
|
|
|
|
|
|
|
if (target->bufend != NULL)
|
|
|
|
avail = target->bufend - target->bufptr;
|
|
|
|
else
|
|
|
|
avail = slen;
|
|
|
|
if (avail <= 0)
|
|
|
|
{
|
|
|
|
/* buffer full, can we dump to stream? */
|
|
|
|
if (target->stream == NULL)
|
|
|
|
{
|
|
|
|
target->nchars += slen; /* no, lose the data */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
flushbuffer(target);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
avail = Min(avail, slen);
|
|
|
|
memset(target->bufptr, c, avail);
|
|
|
|
target->bufptr += avail;
|
|
|
|
slen -= avail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
adjust_sign(int is_negative, int forcesign, int *signvalue)
|
|
|
|
{
|
|
|
|
if (is_negative)
|
|
|
|
{
|
|
|
|
*signvalue = '-';
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else if (forcesign)
|
|
|
|
*signvalue = '+';
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
static int
|
|
|
|
compute_padlen(int minlen, int vallen, int leftjust)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
int padlen;
|
|
|
|
|
|
|
|
padlen = minlen - vallen;
|
|
|
|
if (padlen < 0)
|
|
|
|
padlen = 0;
|
|
|
|
if (leftjust)
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
padlen = -padlen;
|
|
|
|
return padlen;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
leading_pad(int zpad, int signvalue, int *padlen, PrintfTarget *target)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
int maxpad;
|
|
|
|
|
|
|
|
if (*padlen > 0 && zpad)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
if (signvalue)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
dopr_outch(signvalue, target);
|
|
|
|
--(*padlen);
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
signvalue = 0;
|
|
|
|
}
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
if (*padlen > 0)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
dopr_outchmulti(zpad, *padlen, target);
|
|
|
|
*padlen = 0;
|
|
|
|
}
|
|
|
|
}
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
maxpad = (signvalue != 0);
|
|
|
|
if (*padlen > maxpad)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
dopr_outchmulti(' ', *padlen - maxpad, target);
|
|
|
|
*padlen = maxpad;
|
|
|
|
}
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
if (signvalue)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
dopr_outch(signvalue, target);
|
|
|
|
if (*padlen > 0)
|
|
|
|
--(*padlen);
|
|
|
|
else if (*padlen < 0)
|
|
|
|
++(*padlen);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
trailing_pad(int padlen, PrintfTarget *target)
|
|
|
|
{
|
Make assorted performance improvements in snprintf.c.
In combination, these changes make our version of snprintf as fast
or faster than most platforms' native snprintf, except for cases
involving floating-point conversion (which we still delegate to
the native sprintf). The speed penalty for a float conversion
is down to around 10% though, much better than before.
Notable changes:
* Rather than always parsing the format twice to see if it contains
instances of %n$, do the extra scan only if we actually find a $.
This obviously wins for non-localized formats, and even when there
is use of %n$, we can avoid scanning text before the first % twice.
* Use strchrnul() if available to find the next %, and emit the
literal text between % escapes as strings rather than char-by-char.
* Create a bespoke function (dopr_outchmulti) for the common case
of emitting N copies of the same character, in place of writing
loops around dopr_outch.
* Simplify construction of the format string for invocations of sprintf
for floats.
* Const-ify some internal functions, and avoid unnecessary use of
pass-by-reference arguments.
Patch by me, reviewed by Andres Freund
Discussion: https://postgr.es/m/11787.1534530779@sss.pgh.pa.us
7 years ago
|
|
|
if (padlen < 0)
|
|
|
|
dopr_outchmulti(' ', -padlen, target);
|
|
|
|
}
|