rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a *second* buffer overrun bug in to_ascii(). Grumble.

This commit is contained in:
Tom Lane 2003-07-14 16:41:38 +00:00
parent 6eb27d16b6
commit b1eb992cc5
1 changed files with 36 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/backend/utils/adt/ascii.c
View File

@ -1,31 +1,31 @@
/* ----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* ascii.c * ascii.c
*
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.14 2003/04/02 21:07:59 tgl Exp $
*
* Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
*
*
* TO_ASCII()
*
* The PostgreSQL routine for string to ascii conversion. * The PostgreSQL routine for string to ascii conversion.
* *
* ----------------------------------------------------------------------- * Portions Copyright (c) 1999-2002, PostgreSQL Global Development Group
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.15 2003/07/14 16:41:38 tgl Exp $
*
*-----------------------------------------------------------------------
*/ */
#include "postgres.h" #include "postgres.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
#include "utils/ascii.h" #include "utils/ascii.h"
static void pg_to_ascii(unsigned char *src, unsigned char *src_end,
unsigned char *dest, int enc);
static text *encode_to_ascii(text *data, int enc); static text *encode_to_ascii(text *data, int enc);
/* ---------- /* ----------
* to_ascii * to_ascii
* ---------- * ----------
*/ */
char * static void
pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *desc, int enc) pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *dest, int enc)
{ {
unsigned char *x; unsigned char *x;
unsigned char *ascii; unsigned char *ascii;
@ -37,7 +37,6 @@ pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *desc, int
#define RANGE_128 128 #define RANGE_128 128
#define RANGE_160 160 #define RANGE_160 160
if (enc == PG_LATIN1) if (enc == PG_LATIN1)
{ {
/* /*
@ -64,9 +63,9 @@ pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *desc, int
} }
else else
{ {
elog(ERROR, "pg_to_ascii(): unsupported encoding from %s", elog(ERROR, "unsupported encoding conversion from %s to ASCII",
pg_encoding_to_char(enc)); pg_encoding_to_char(enc));
return NULL; /* keep compiler quiet */ return; /* keep compiler quiet */
} }
/* /*
@ -75,27 +74,27 @@ pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *desc, int
for (x = src; x < src_end; x++) for (x = src; x < src_end; x++)
{ {
if (*x < 128) if (*x < 128)
*desc++ = *x; *dest++ = *x;
else if (*x < range) else if (*x < range)
*desc++ = ' '; /* bogus 128 to 'range' */ *dest++ = ' '; /* bogus 128 to 'range' */
else else
*desc++ = ascii[*x - range]; *dest++ = ascii[*x - range];
} }
return desc;
} }
/* ---------- /* ----------
* encode text * encode text
*
* The text datum is overwritten in-place, therefore this coding method
* cannot support conversions that change the string length!
* ---------- * ----------
*/ */
static text * static text *
encode_to_ascii(text *data, int enc) encode_to_ascii(text *data, int enc)
{ {
pg_to_ascii( pg_to_ascii((unsigned char *) VARDATA(data), /* src */
(unsigned char *) VARDATA(data), /* src */ (unsigned char *) (data) + VARSIZE(data), /* src end */
VARDATA(data) + VARSIZE(data), /* src end */ (unsigned char *) VARDATA(data), /* dest */
(unsigned char *) VARDATA(data), /* desc */
enc); /* encoding */ enc); /* encoding */
return data; return data;
@ -108,14 +107,10 @@ encode_to_ascii(text *data, int enc)
Datum Datum
to_ascii_encname(PG_FUNCTION_ARGS) to_ascii_encname(PG_FUNCTION_ARGS)
{ {
PG_RETURN_TEXT_P text *data = PG_GETARG_TEXT_P_COPY(0);
( int enc = pg_char_to_encoding(NameStr(*PG_GETARG_NAME(1)));
encode_to_ascii
( PG_RETURN_TEXT_P(encode_to_ascii(data, enc));
PG_GETARG_TEXT_P_COPY(0),
pg_char_to_encoding(NameStr(*PG_GETARG_NAME(1)))
)
);
} }
/* ---------- /* ----------
@ -125,14 +120,10 @@ to_ascii_encname(PG_FUNCTION_ARGS)
Datum Datum
to_ascii_enc(PG_FUNCTION_ARGS) to_ascii_enc(PG_FUNCTION_ARGS)
{ {
PG_RETURN_TEXT_P text *data = PG_GETARG_TEXT_P_COPY(0);
( int enc = PG_GETARG_INT32(1);
encode_to_ascii
( PG_RETURN_TEXT_P(encode_to_ascii(data, enc));
PG_GETARG_TEXT_P_COPY(0),
PG_GETARG_INT32(1)
)
);
} }
/* ---------- /* ----------
@ -142,12 +133,8 @@ to_ascii_enc(PG_FUNCTION_ARGS)
Datum Datum
to_ascii_default(PG_FUNCTION_ARGS) to_ascii_default(PG_FUNCTION_ARGS)
{ {
PG_RETURN_TEXT_P text *data = PG_GETARG_TEXT_P_COPY(0);
( int enc = GetDatabaseEncoding();
encode_to_ascii
( PG_RETURN_TEXT_P(encode_to_ascii(data, enc));
PG_GETARG_TEXT_P_COPY(0),
GetDatabaseEncoding()
)
);
} }