Fix "off by VARHDRSZ" bug in (Cyrillic) recode support.

petere · petere · commit 7ff8d11065f8 · 2001-04-19T19:01:23.000Z
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.75 2001/03/22 03:59:55 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.76 2001/04/19 19:01:23 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -361,7 +361,7 @@ varcharin(PG_FUNCTION_ARGS)
 	memcpy(VARDATA(result), s, len - VARHDRSZ);
 
 #ifdef CYR_RECODE
-	convertstr(VARDATA(result), len, 0);
+	convertstr(VARDATA(result), len - VARHDRSZ, 0);
 #endif
 
 	PG_RETURN_VARCHAR_P(result);

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.75 2001/03/22 03:59:55 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varchar.c,v 1.76 2001/04/19 19:01:23 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -361,7 +361,7 @@ varcharin(PG_FUNCTION_ARGS)`
`361`	`361`	`memcpy(VARDATA(result), s, len - VARHDRSZ);`
`362`	`362`
`363`	`363`	`#ifdef CYR_RECODE`
`364`		`- convertstr(VARDATA(result), len, 0);`
	`364`	`+ convertstr(VARDATA(result), len - VARHDRSZ, 0);`
`365`	`365`	`#endif`
`366`	`366`
`367`	`367`	`PG_RETURN_VARCHAR_P(result);`