mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix buffer overrun in to_ascii(), per report from Guido Notari.

This commit is contained in:
Tom Lane 2003-04-02 21:08:14 +00:00
parent 28afe6f8ef
commit 07b776f52f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------
* ascii.c
*
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.12 2001/11/05 17:46:28 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/utils/adt/ascii.c,v 1.12.2.1 2003/04/02 21:08:14 tgl Exp $
*
* Portions Copyright (c) 1999-2000, PostgreSQL Global Development Group
*
@ -67,9 +67,9 @@ static text *encode_to_ascii(text *data, int enc);
char *
pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *desc, int enc)
{
unsigned char *x = NULL;
unsigned char *ascii = NULL;
int range = 0;
unsigned char *x;
unsigned char *ascii;
int range;
/*
* relevant start for an encoding
@ -106,12 +106,13 @@ pg_to_ascii(unsigned char *src, unsigned char *src_end, unsigned char *desc, int
{
elog(ERROR, "pg_to_ascii(): unsupported encoding from %s",
pg_encoding_to_char(enc));
return NULL; /* keep compiler quiet */
}
/*
* Encode
*/
for (x = src; x <= src_end; x++)
for (x = src; x < src_end; x++)
{
if (*x < 128)
*desc++ = *x;