2003-02-05 18:41:33 +01:00
|
|
|
/*
|
|
|
|
* regerror - error-code expansion
|
1996-07-09 08:22:35 +02:00
|
|
|
*
|
2014-05-06 18:12:18 +02:00
|
|
|
* Copyright (c) 1998, 1999 Henry Spencer. All rights reserved.
|
2003-08-04 02:43:34 +02:00
|
|
|
*
|
2003-02-05 18:41:33 +01:00
|
|
|
* Development of this software was funded, in part, by Cray Research Inc.,
|
|
|
|
* UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
|
|
|
|
* Corporation, none of whom are responsible for the results. The author
|
2003-08-04 02:43:34 +02:00
|
|
|
* thanks all of them.
|
|
|
|
*
|
2003-02-05 18:41:33 +01:00
|
|
|
* Redistribution and use in source and binary forms -- with or without
|
|
|
|
* modification -- are permitted for any purpose, provided that
|
|
|
|
* redistributions in source form retain this entire copyright notice and
|
|
|
|
* indicate the origin and nature of any modifications.
|
2003-08-04 02:43:34 +02:00
|
|
|
*
|
2003-02-05 18:41:33 +01:00
|
|
|
* I'd appreciate being given credit for this package in the documentation
|
|
|
|
* of software which uses it, but that is not a requirement.
|
2003-08-04 02:43:34 +02:00
|
|
|
*
|
2003-02-05 18:41:33 +01:00
|
|
|
* THIS SOFTWARE IS PROVIDED ``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
|
|
|
|
* HENRY SPENCER 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.
|
1996-07-09 08:22:35 +02:00
|
|
|
*
|
2010-09-20 22:08:53 +02:00
|
|
|
* src/backend/regex/regerror.c
|
1996-07-09 08:22:35 +02:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2003-02-05 18:41:33 +01:00
|
|
|
#include "regex/regguts.h"
|
1996-07-09 08:22:35 +02:00
|
|
|
|
2003-02-05 18:41:33 +01:00
|
|
|
/* unknown-error explanation */
|
2014-01-18 22:04:11 +01:00
|
|
|
static const char unk[] = "*** unknown regex error code 0x%x ***";
|
1997-09-07 07:04:48 +02:00
|
|
|
|
2003-02-05 18:41:33 +01:00
|
|
|
/* struct to map among codes, code names, and explanations */
|
2014-01-18 22:04:11 +01:00
|
|
|
static const struct rerr
|
2003-08-04 02:43:34 +02:00
|
|
|
{
|
|
|
|
int code;
|
2008-02-14 18:33:37 +01:00
|
|
|
const char *name;
|
|
|
|
const char *explain;
|
2017-06-21 20:39:04 +02:00
|
|
|
} rerrs[] =
|
2003-08-04 02:43:34 +02:00
|
|
|
|
|
|
|
{
|
2003-02-05 18:41:33 +01:00
|
|
|
/* the actual table is built from regex.h */
|
2012-06-10 21:20:04 +02:00
|
|
|
#include "regex/regerrs.h" /* pgrminclude ignore */
|
2003-08-04 02:43:34 +02:00
|
|
|
{
|
|
|
|
-1, "", "oops"
|
|
|
|
}, /* explanation special-cased in code */
|
1996-07-09 08:22:35 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
2003-02-05 18:41:33 +01:00
|
|
|
* pg_regerror - the interface to error numbers
|
1996-07-09 08:22:35 +02:00
|
|
|
*/
|
|
|
|
/* ARGSUSED */
|
2003-08-04 02:43:34 +02:00
|
|
|
size_t /* actual space needed (including NUL) */
|
2003-02-05 18:41:33 +01:00
|
|
|
pg_regerror(int errcode, /* error code, or REG_ATOI or REG_ITOA */
|
2003-08-04 02:43:34 +02:00
|
|
|
const regex_t *preg, /* associated regex_t (unused at present) */
|
2003-02-05 18:41:33 +01:00
|
|
|
char *errbuf, /* result buffer (unless errbuf_size==0) */
|
2003-08-04 02:43:34 +02:00
|
|
|
size_t errbuf_size) /* available space in errbuf, can be 0 */
|
1996-07-09 08:22:35 +02:00
|
|
|
{
|
2014-01-18 22:04:11 +01:00
|
|
|
const struct rerr *r;
|
2008-02-14 18:33:37 +01:00
|
|
|
const char *msg;
|
Phase 2 of pgindent updates.
Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.
Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code. The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there. BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs. So the
net result is that in about half the cases, such comments are placed
one tab stop left of before. This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.
Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:18:54 +02:00
|
|
|
char convbuf[sizeof(unk) + 50]; /* 50 = plenty for int */
|
2003-08-04 02:43:34 +02:00
|
|
|
size_t len;
|
|
|
|
int icode;
|
1996-07-09 08:22:35 +02:00
|
|
|
|
2003-08-04 02:43:34 +02:00
|
|
|
switch (errcode)
|
|
|
|
{
|
|
|
|
case REG_ATOI: /* convert name to number */
|
|
|
|
for (r = rerrs; r->code >= 0; r++)
|
|
|
|
if (strcmp(r->name, errbuf) == 0)
|
|
|
|
break;
|
|
|
|
sprintf(convbuf, "%d", r->code); /* -1 for unknown */
|
2003-02-05 18:41:33 +01:00
|
|
|
msg = convbuf;
|
2003-08-04 02:43:34 +02:00
|
|
|
break;
|
|
|
|
case REG_ITOA: /* convert number to name */
|
Phase 2 of pgindent updates.
Change pg_bsd_indent to follow upstream rules for placement of comments
to the right of code, and remove pgindent hack that caused comments
following #endif to not obey the general rule.
Commit e3860ffa4dd0dad0dd9eea4be9cc1412373a8c89 wasn't actually using
the published version of pg_bsd_indent, but a hacked-up version that
tried to minimize the amount of movement of comments to the right of
code. The situation of interest is where such a comment has to be
moved to the right of its default placement at column 33 because there's
code there. BSD indent has always moved right in units of tab stops
in such cases --- but in the previous incarnation, indent was working
in 8-space tab stops, while now it knows we use 4-space tabs. So the
net result is that in about half the cases, such comments are placed
one tab stop left of before. This is better all around: it leaves
more room on the line for comment text, and it means that in such
cases the comment uniformly starts at the next 4-space tab stop after
the code, rather than sometimes one and sometimes two tabs after.
Also, ensure that comments following #endif are indented the same
as comments following other preprocessor commands such as #else.
That inconsistency turns out to have been self-inflicted damage
from a poorly-thought-through post-indent "fixup" in pgindent.
This patch is much less interesting than the first round of indent
changes, but also bulkier, so I thought it best to separate the effects.
Discussion: https://postgr.es/m/E1dAmxK-0006EE-1r@gemulon.postgresql.org
Discussion: https://postgr.es/m/30527.1495162840@sss.pgh.pa.us
2017-06-21 21:18:54 +02:00
|
|
|
icode = atoi(errbuf); /* not our problem if this fails */
|
2003-08-04 02:43:34 +02:00
|
|
|
for (r = rerrs; r->code >= 0; r++)
|
|
|
|
if (r->code == icode)
|
|
|
|
break;
|
|
|
|
if (r->code >= 0)
|
|
|
|
msg = r->name;
|
|
|
|
else
|
|
|
|
{ /* unknown; tell him the number */
|
|
|
|
sprintf(convbuf, "REG_%u", (unsigned) icode);
|
|
|
|
msg = convbuf;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default: /* a real, normal error code */
|
|
|
|
for (r = rerrs; r->code >= 0; r++)
|
|
|
|
if (r->code == errcode)
|
|
|
|
break;
|
|
|
|
if (r->code >= 0)
|
|
|
|
msg = r->explain;
|
|
|
|
else
|
|
|
|
{ /* unknown; say so */
|
|
|
|
sprintf(convbuf, unk, errcode);
|
|
|
|
msg = convbuf;
|
|
|
|
}
|
|
|
|
break;
|
1996-07-09 08:22:35 +02:00
|
|
|
}
|
|
|
|
|
2003-02-05 18:41:33 +01:00
|
|
|
len = strlen(msg) + 1; /* space needed, including NUL */
|
2003-08-04 02:43:34 +02:00
|
|
|
if (errbuf_size > 0)
|
|
|
|
{
|
1996-07-09 08:22:35 +02:00
|
|
|
if (errbuf_size > len)
|
2003-02-05 18:41:33 +01:00
|
|
|
strcpy(errbuf, msg);
|
2003-08-04 02:43:34 +02:00
|
|
|
else
|
|
|
|
{ /* truncate to fit */
|
Replace a bunch more uses of strncpy() with safer coding.
strncpy() has a well-deserved reputation for being unsafe, so make an
effort to get rid of nearly all occurrences in HEAD.
A large fraction of the remaining uses were passing length less than or
equal to the known strlen() of the source, in which case no null-padding
can occur and the behavior is equivalent to memcpy(), though doubtless
slower and certainly harder to reason about. So just use memcpy() in
these cases.
In other cases, use either StrNCpy() or strlcpy() as appropriate (depending
on whether padding to the full length of the destination buffer seems
useful).
I left a few strncpy() calls alone in the src/timezone/ code, to keep it
in sync with upstream (the IANA tzcode distribution). There are also a
few such calls in ecpg that could possibly do with more analysis.
AFAICT, none of these changes are more than cosmetic, except for the four
occurrences in fe-secure-openssl.c, which are in fact buggy: an overlength
source leads to a non-null-terminated destination buffer and ensuing
misbehavior. These don't seem like security issues, first because no stack
clobber is possible and second because if your values of sslcert etc are
coming from untrusted sources then you've got problems way worse than this.
Still, it's undesirable to have unpredictable behavior for overlength
inputs, so back-patch those four changes to all active branches.
2015-01-24 19:05:42 +01:00
|
|
|
memcpy(errbuf, msg, errbuf_size - 1);
|
2003-08-04 02:43:34 +02:00
|
|
|
errbuf[errbuf_size - 1] = '\0';
|
1996-07-09 08:22:35 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-09-01 05:29:17 +02:00
|
|
|
return len;
|
1996-07-09 08:22:35 +02:00
|
|
|
}
|