From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 8 Jan 2002 17:03:41 +0000 (+0000)
Subject: Fix lpad() and rpad() to produce correct results in variable-length
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=f50bbd577cae9a687433ea315e39ee0ef9ecc13a;p=users%2Fbernd%2Fpostgres.git

Fix lpad() and rpad() to produce correct results in variable-length
multibyte encodings.
---

diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index 9b089ac725..3e518725ef 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -200,10 +200,8 @@ lpad(PG_FUNCTION_ARGS)
 #ifdef MULTIBYTE
 	bytelen = pg_database_encoding_max_length() * len;
 	ret = (text *) palloc(VARHDRSZ + bytelen);
-	VARATT_SIZEP(ret) = VARHDRSZ + bytelen;
 #else
 	ret = (text *) palloc(VARHDRSZ + len);
-	VARATT_SIZEP(ret) = VARHDRSZ + len;
 #endif
 	m = len - s1len;
 
@@ -247,6 +245,8 @@ lpad(PG_FUNCTION_ARGS)
 		*ptr_ret++ = *ptr1++;
 #endif
 
+	VARATT_SIZEP(ret) = ptr_ret - (char *) ret;
+
 	PG_RETURN_TEXT_P(ret);
 }
 
@@ -311,10 +311,8 @@ rpad(PG_FUNCTION_ARGS)
 #ifdef MULTIBYTE
 	bytelen = pg_database_encoding_max_length() * len;
 	ret = (text *) palloc(VARHDRSZ + bytelen);
-	VARATT_SIZEP(ret) = VARHDRSZ + bytelen;
 #else
 	ret = (text *) palloc(VARHDRSZ + len);
-	VARATT_SIZEP(ret) = VARHDRSZ + len;
 #endif
 	m = len - s1len;
 
@@ -358,6 +356,8 @@ rpad(PG_FUNCTION_ARGS)
 	}
 #endif
 
+	VARATT_SIZEP(ret) = ptr_ret - (char *) ret;
+
 	PG_RETURN_TEXT_P(ret);
 }