Commit7e99cea

committed

Implement following item in TODO:

* Reject character sequences those are not valid in their charset

1 parent95dc778 commit7e99ceaCopy full SHA for 7e99cea

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.81 2001/07/15 11:07:37 ishii Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.82 2001/09/11 05:18:59 ishii Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -75,10 +75,14 @@ bpcharin(PG_FUNCTION_ARGS)`
`75`	`75`	`inti;`
`76`	`76`	`#ifdefMULTIBYTE`
`77`	`77`	`intcharlen;/* number of charcters in the input string */`
	`78`	`+char*ermsg;`
`78`	`79`	`#endif`
`79`	`80`
`80`	`81`	`len=strlen(s);`
`81`	`82`	`#ifdefMULTIBYTE`
	`83`	`+if ((ermsg=pg_verifymbstr(s,len)))`
	`84`	`+elog(ERROR,"%s",ermsg);`
	`85`	`+`
`82`	`86`	`charlen=pg_mbstrlen(s);`
`83`	`87`	`#endif`
`84`	`88`
`@@ -405,8 +409,15 @@ varcharin(PG_FUNCTION_ARGS)`
`405`	`409`	`int32atttypmod=PG_GETARG_INT32(2);`
`406`	`410`	`VarChar*result;`
`407`	`411`	`size_tlen,maxlen;`
	`412`	`+#ifdefMULTIBYTE`
	`413`	`+char*ermsg;`
	`414`	`+#endif`
`408`	`415`
`409`	`416`	`len=strlen(s);`
	`417`	`+#ifdefMULTIBYTE`
	`418`	`+if ((ermsg=pg_verifymbstr(s,len)))`
	`419`	`+elog(ERROR,"%s",ermsg);`
	`420`	`+#endif`
`410`	`421`	`maxlen=atttypmod-VARHDRSZ;`
`411`	`422`
`412`	`423`	`if (atttypmod >= (int32)VARHDRSZ&&len>maxlen)`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.71 2001/08/1318:45:35 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.72 2001/09/11 05:18:59 ishii Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -154,8 +154,17 @@ textin(PG_FUNCTION_ARGS)`
`154`	`154`	`char*inputText=PG_GETARG_CSTRING(0);`
`155`	`155`	`text*result;`
`156`	`156`	`intlen;`
	`157`	`+#ifdefMULTIBYTE`
	`158`	`+char*ermsg;`
	`159`	`+#endif`
`157`	`160`
`158`	`161`	`len=strlen(inputText)+VARHDRSZ;`
	`162`	`+`
	`163`	`+#ifdefMULTIBYTE`
	`164`	`+if ((ermsg=pg_verifymbstr(inputText,len-VARHDRSZ)))`
	`165`	`+elog(ERROR,"%s",ermsg);`
	`166`	`+#endif`
	`167`	`+`
`159`	`168`	`result= (text*)palloc(len);`
`160`	`169`	`VARATT_SIZEP(result)=len;`
`161`	`170`

Comments

(0)