Commita867b40

committed

Fix tsvectorout() and tsqueryout() to escape backslesh, add test of that.

Patch by Bruce Momjian <bruce@momjian.us>Backpatch is needed, but it's impossible to apply it directly

1 parent2f1e7ff commita867b40Copy full SHA for a867b40

File tree

+30

-2

lines changed

+30

-2

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.10 2007/11/15 22:25:16 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery.c,v 1.11 2007/11/16 15:05:59 teodor Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -614,6 +614,11 @@ infix(INFIX *in, bool first)`
`614`	`614`	`*(in->cur)='\'';`
`615`	`615`	`in->cur++;`
`616`	`616`	`}`
	`617`	`+elseif (t_iseq(op,'\\'))`
	`618`	`+{`
	`619`	`+*(in->cur)='\\';`
	`620`	`+in->cur++;`
	`621`	`+}`
`617`	`622`	`COPYCHAR(in->cur,op);`
`618`	`623`
`619`	`624`	`clen=pg_mblen(op);`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector.c,v 1.8 2007/11/15 22:25:16 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector.c,v 1.9 2007/11/16 15:05:59 teodor Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -345,6 +345,8 @@ tsvectorout(PG_FUNCTION_ARGS)`
`345`	`345`
`346`	`346`	`if (t_iseq(curin,'\''))`
`347`	`347`	`*curout++='\'';`
	`348`	`+elseif (t_iseq(curin,'\\'))`
	`349`	`+*curout++='\\';`
`348`	`350`
`349`	`351`	`while (len--)`
`350`	`352`	`curout++=curin++;`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,18 @@ SELECT E'''1 \\''2'' '' 3'' 4 '::tsvector;`
`59`	`59`	`'4' ' 3' '1 ''2'`
`60`	`60`	`(1 row)`
`61`	`61`
	`62`	`+SELECT $$'\\as' ab\c ab\\c AB\\\c ab\\\\c$$::tsvector;`
	`63`	`+ tsvector`
	`64`	`+----------------------------------------`
	`65`	`+ '\\as' 'abc' 'AB\\c' 'ab\\c' 'ab\\\\c'`
	`66`	`+(1 row)`
	`67`	`+`
	`68`	`+SELECT tsvectorin(tsvectorout($$'\\as' ab\c ab\\c AB\\\c ab\\\\c$$::tsvector));`
	`69`	`+ tsvectorin`
	`70`	`+----------------------------------------`
	`71`	`+ '\\as' 'abc' 'AB\\c' 'ab\\c' 'ab\\\\c'`
	`72`	`+(1 row)`
	`73`	`+`
`62`	`74`	`SELECT '''w'':4A,3B,2C,1D,5 a:8';`
`63`	`75`	`?column?`
`64`	`76`	`-----------------------`
`@@ -318,6 +330,12 @@ SELECT E'1&(''2''&('' 4''&(\\\|5 \| ''6 \\'' !\|&'')))'::tsquery;`
`318`	`330`	`'1' & '2' & ' 4' & ( '\|5' \| '6 '' !\|&' )`
`319`	`331`	`(1 row)`
`320`	`332`
	`333`	`+SELECT $$'\\as'$$::tsquery;`
	`334`	`+ tsquery`
	`335`	`+---------`
	`336`	`+ '\\as'`
	`337`	`+(1 row)`
	`338`	`+`
`321`	`339`	`SELECT 'a' < 'b & c'::tsquery as "true";`
`322`	`340`	`true`
`323`	`341`	`------`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ SELECT E'''1 \\''2'''::tsvector;`
`10`	`10`	`SELECT E'''1\\''2''3'::tsvector;`
`11`	`11`	`SELECT E'''1\\''2'' 3'::tsvector;`
`12`	`12`	`SELECT E'''1\\''2'''' 3'' 4'::tsvector;`
	`13`	`+SELECT $$'\\as' ab\c ab\\c AB\\\c ab\\\\c$$::tsvector;`
	`14`	`+SELECT tsvectorin(tsvectorout($$'\\as' ab\c ab\\c AB\\\c ab\\\\c$$::tsvector));`
`13`	`15`	`SELECT'''w'':4A,3B,2C,1D,5 a:8';`
`14`	`16`	`SELECT'a:3A b:2a'::tsvector\|\|'ba:1234 a:1B';`
`15`	`17`	`SELECT setweight('w:12B w:13* w:12,5,6 a:1,3* a:3 w asd:1dc asd zxc:81,567,222A'::tsvector,'c');`
`@@ -55,6 +57,7 @@ SELECT '1&2&4&5&6'::tsquery;`
`55`	`57`	`SELECT'1&(2&(4&(5\|6)))'::tsquery;`
`56`	`58`	`SELECT'1&(2&(4&(5\|!6)))'::tsquery;`
`57`	`59`	`SELECT E'1&(''2''&('' 4''&(\\\|5 \|''6\\'' !\|&'')))'::tsquery;`
	`60`	`+SELECT $$'\\as'$$::tsquery;`
`58`	`61`
`59`	`62`	`SELECT'a'<'b & c'::tsqueryas"true";`
`60`	`63`	`SELECT'a'>'b & c'::tsqueryas"false";`

Comments

(0)