Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit649d854

Browse files
committed
Fix lpad() and rpad() to produce correct results in variable-length
multibyte encodings.
1 parentf872846 commit649d854

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

‎src/backend/utils/adt/oracle_compat.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
*$Header: /cvsroot/pgsql/src/backend/utils/adt/oracle_compat.c,v 1.36 2001/10/25 05:49:45 momjian Exp $
12+
*$Header: /cvsroot/pgsql/src/backend/utils/adt/oracle_compat.c,v 1.37 2002/01/08 17:03:41 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -200,10 +200,8 @@ lpad(PG_FUNCTION_ARGS)
200200
#ifdefMULTIBYTE
201201
bytelen=pg_database_encoding_max_length()*len;
202202
ret= (text*)palloc(VARHDRSZ+bytelen);
203-
VARATT_SIZEP(ret)=VARHDRSZ+bytelen;
204203
#else
205204
ret= (text*)palloc(VARHDRSZ+len);
206-
VARATT_SIZEP(ret)=VARHDRSZ+len;
207205
#endif
208206
m=len-s1len;
209207

@@ -247,6 +245,8 @@ lpad(PG_FUNCTION_ARGS)
247245
*ptr_ret++=*ptr1++;
248246
#endif
249247

248+
VARATT_SIZEP(ret)=ptr_ret- (char*)ret;
249+
250250
PG_RETURN_TEXT_P(ret);
251251
}
252252

@@ -311,10 +311,8 @@ rpad(PG_FUNCTION_ARGS)
311311
#ifdefMULTIBYTE
312312
bytelen=pg_database_encoding_max_length()*len;
313313
ret= (text*)palloc(VARHDRSZ+bytelen);
314-
VARATT_SIZEP(ret)=VARHDRSZ+bytelen;
315314
#else
316315
ret= (text*)palloc(VARHDRSZ+len);
317-
VARATT_SIZEP(ret)=VARHDRSZ+len;
318316
#endif
319317
m=len-s1len;
320318

@@ -358,6 +356,8 @@ rpad(PG_FUNCTION_ARGS)
358356
}
359357
#endif
360358

359+
VARATT_SIZEP(ret)=ptr_ret- (char*)ret;
360+
361361
PG_RETURN_TEXT_P(ret);
362362
}
363363

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp