database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

Implement following item in TODO:

Browse Source 
* Reject character sequences those are not valid in their charset
This commit is contained in:
Tatsuo Ishii 2001-09-11 05:18:59 +00:00
parent 95dc7785b5
commit 7e99cea816
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/utils/adt/varchar.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.81 2001/07/15 11:07:37 ishii Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.82 2001/09/11 05:18:59 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -75,10 +75,14 @@ bpcharin(PG_FUNCTION_ARGS)
int i; int i;
#ifdef MULTIBYTE #ifdef MULTIBYTE
int charlen; /* number of charcters in the input string */ int charlen; /* number of charcters in the input string */
char *ermsg;
#endif #endif
len = strlen(s); len = strlen(s);
#ifdef MULTIBYTE #ifdef MULTIBYTE
if ((ermsg = pg_verifymbstr(s, len)))
elog(ERROR,"%s",ermsg);
charlen = pg_mbstrlen(s); charlen = pg_mbstrlen(s);
#endif #endif
@ -405,8 +409,15 @@ varcharin(PG_FUNCTION_ARGS)
int32 atttypmod = PG_GETARG_INT32(2); int32 atttypmod = PG_GETARG_INT32(2);
VarChar *result; VarChar *result;
size_t len, maxlen; size_t len, maxlen;
#ifdef MULTIBYTE
char *ermsg;
#endif
len = strlen(s); len = strlen(s);
#ifdef MULTIBYTE
if ((ermsg = pg_verifymbstr(s, len)))
elog(ERROR,"%s",ermsg);
#endif
maxlen = atttypmod - VARHDRSZ; maxlen = atttypmod - VARHDRSZ;
if (atttypmod >= (int32) VARHDRSZ && len > maxlen) if (atttypmod >= (int32) VARHDRSZ && len > maxlen)

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

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.71 2001/08/13 18:45:35 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.72 2001/09/11 05:18:59 ishii Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -154,8 +154,17 @@ textin(PG_FUNCTION_ARGS)
char *inputText = PG_GETARG_CSTRING(0); char *inputText = PG_GETARG_CSTRING(0);
text *result; text *result;
int len; int len;
#ifdef MULTIBYTE
char *ermsg;
#endif
len = strlen(inputText) + VARHDRSZ; len = strlen(inputText) + VARHDRSZ;
#ifdef MULTIBYTE
if ((ermsg = pg_verifymbstr(inputText, len - VARHDRSZ)))
elog(ERROR,"%s",ermsg);
#endif
result = (text *) palloc(len); result = (text *) palloc(len);
VARATT_SIZEP(result) = len; VARATT_SIZEP(result) = len;