Commit4cdb41b

committed

Ensure plperl strings are always correctly UTF8 encoded.

Amit Khandekar and Alex Hunsaker.Backpatched to 9.1 where the problem first occurred.

1 parentfd6dbc2 commit4cdb41bCopy full SHA for 4cdb41b

File tree

+32

-2

lines changed

+32

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ PSQLDIR = $(bindir)`
`57`	`57`
`58`	`58`	`include$(top_srcdir)/src/Makefile.shlib`
`59`	`59`
`60`		`-plperl.o: perlchunks.h plperl_opmask.h`
	`60`	`+plperl.o: perlchunks.h plperl_opmask.h plperl_helpers.h`
`61`	`61`
`62`	`62`	`plperl_opmask.h: plperl_opmask.pl`
`63`	`63`	`@if [ x"$(perl_privlibexp)"= x"" ];thenecho"configure switch --with-perl was not specified.";exit 1;fi`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -650,6 +650,16 @@ CONTEXT: PL/Perl anonymous code block`
`650`	`650`	`DO $do$ use warnings FATAL => qw(void) ; my @y; my $x = sort @y; 1; $do$ LANGUAGE plperl;`
`651`	`651`	`ERROR: Useless use of sort in scalar context at line 1.`
`652`	`652`	`CONTEXT: PL/Perl anonymous code block`
	`653`	`+--`
	`654`	`+-- Make sure strings are validated`
	`655`	`+-- Should fail for all encodings, as nul bytes are never permitted.`
	`656`	`+--`
	`657`	`+CREATE OR REPLACE FUNCTION perl_zerob() RETURNS TEXT AS $$`
	`658`	`+ return "abcd\0efg";`
	`659`	`+$$ LANGUAGE plperlu;`
	`660`	`+SELECT perl_zerob();`
	`661`	`+ERROR: invalid byte sequence for encoding "UTF8": 0x00`
	`662`	`+CONTEXT: PL/Perl function "perl_zerob"`
`653`	`663`	`-- make sure functions marked as VOID without an explicit return work`
`654`	`664`	`CREATE OR REPLACE FUNCTION myfuncs() RETURNS void AS $$`
`655`	`665`	`$_SHARED{myquote} = sub {`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,21 @@`
`7`	`7`	`staticinlinechar*`
`8`	`8`	`utf_u2e(constchar*utf8_str,size_tlen)`
`9`	`9`	`{`
`10`		`-charret= (char)pg_do_encoding_conversion((unsignedchar*)utf8_str,len,PG_UTF8,GetDatabaseEncoding());`
	`10`	`+intenc=GetDatabaseEncoding();`
	`11`	`+`
	`12`	`+charret= (char)pg_do_encoding_conversion((unsignedchar*)utf8_str,len,PG_UTF8,enc);`
	`13`	`+`
	`14`	`+/*`
	`15`	`+* when we are a PG_UTF8 or SQL_ASCII database`
	`16`	`+* pg_do_encoding_conversion() will not do any conversion or`
	`17`	`+* verification. we need to do it manually instead.`
	`18`	`+*/`
	`19`	`+if (enc==PG_UTF8\|\|enc==PG_SQL_ASCII)`
	`20`	`+pg_verify_mbstr_len(PG_UTF8,utf8_str,len, false);`
`11`	`21`
`12`	`22`	`if (ret==utf8_str)`
`13`	`23`	`ret=pstrdup(ret);`
	`24`	`+`
`14`	`25`	`returnret;`
`15`	`26`	`}`
`16`	`27`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -423,6 +423,15 @@ DO $do$ use strict; my $name = "foo"; my $ref = $$name; $do$ LANGUAGE plperl;`
`423`	`423`	`-- yields "ERROR: Useless use of sort in scalar context."`
`424`	`424`	`DO $do$ use warnings FATAL=> qw(void) ; my @y; my $x= sort @y;1; $do$ LANGUAGE plperl;`
`425`	`425`
	`426`	`+--`
	`427`	`+-- Make sure strings are validated`
	`428`	`+-- Should fail for all encodings, as nul bytes are never permitted.`
	`429`	`+--`
	`430`	`+CREATE OR REPLACEFUNCTIONperl_zerob() RETURNSTEXTAS $$`
	`431`	`+ return"abcd\0efg";`
	`432`	`+$$ LANGUAGE plperlu;`
	`433`	`+SELECT perl_zerob();`
	`434`	`+`
`426`	`435`	`-- make sure functions marked as VOID without an explicit return work`
`427`	`436`	`CREATE OR REPLACEFUNCTIONmyfuncs() RETURNS voidAS $$`
`428`	`437`	`$_SHARED{myquote}= sub {`

Comments

(0)