Commit1c92724

committed

Set read_only = TRUE while evaluating input queries for ts_rewrite()

and ts_stat(), per my recent suggestion. Also add a possibly-not-needed-but-can't-hurt check for NULL SPI_tuptable, before we try to dereferencesame.

1 parent592c88a commit1c92724Copy full SHA for 1c92724

File tree

+10

-8

lines changed

+10

-8

lines changed

Lines changed: 5 additions & 4 deletions

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_rewrite.c,v 1.6 2007/10/2402:24:47 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.7 2007/10/2403:30:03 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -259,7 +259,7 @@ tsquery_rewrite_query(PG_FUNCTION_ARGS)`
`259`	`259`	`MemoryContextoldcontext;`
`260`	`260`	`QTNode*tree;`
`261`	`261`	`char*buf;`
`262`		`-void*plan;`
	`262`	`+SPIPlanPtrplan;`
`263`	`263`	`Portalportal;`
`264`	`264`	`boolisnull;`
`265`	`265`	`inti;`
`@@ -281,12 +281,13 @@ tsquery_rewrite_query(PG_FUNCTION_ARGS)`
`281`	`281`	`if ((plan=SPI_prepare(buf,0,NULL))==NULL)`
`282`	`282`	`elog(ERROR,"SPI_prepare(\"%s\") failed",buf);`
`283`	`283`
`284`		`-if ((portal=SPI_cursor_open(NULL,plan,NULL,NULL,false))==NULL)`
	`284`	`+if ((portal=SPI_cursor_open(NULL,plan,NULL,NULL,true))==NULL)`
`285`	`285`	`elog(ERROR,"SPI_cursor_open(\"%s\") failed",buf);`
`286`	`286`
`287`	`287`	`SPI_cursor_fetch(portal, true,100);`
`288`	`288`
`289`		`-if (SPI_tuptable->tupdesc->natts!=2\|\|`
	`289`	`+if (SPI_tuptable==NULL\|\|`
	`290`	`+SPI_tuptable->tupdesc->natts!=2\|\|`
`290`	`291`	`SPI_gettypeid(SPI_tuptable->tupdesc,1)!=TSQUERYOID\|\|`
`291`	`292`	`SPI_gettypeid(SPI_tuptable->tupdesc,2)!=TSQUERYOID)`
`292`	`293`	`ereport(ERROR,`

Lines changed: 5 additions & 4 deletions

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_op.c,v 1.6 2007/10/23 00:51:23 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.7 2007/10/24 03:30:03 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1088,19 +1088,20 @@ ts_stat_sql(text txt, text ws)`
`1088`	`1088`	`*stat;`
`1089`	`1089`	`boolisnull;`
`1090`	`1090`	`Portalportal;`
`1091`		`-void*plan;`
	`1091`	`+SPIPlanPtrplan;`
`1092`	`1092`
`1093`	`1093`	`if ((plan=SPI_prepare(query,0,NULL))==NULL)`
`1094`	`1094`	`/* internal error */`
`1095`	`1095`	`elog(ERROR,"SPI_prepare(\"%s\") failed",query);`
`1096`	`1096`
`1097`		`-if ((portal=SPI_cursor_open(NULL,plan,NULL,NULL,false))==NULL)`
	`1097`	`+if ((portal=SPI_cursor_open(NULL,plan,NULL,NULL,true))==NULL)`
`1098`	`1098`	`/* internal error */`
`1099`	`1099`	`elog(ERROR,"SPI_cursor_open(\"%s\") failed",query);`
`1100`	`1100`
`1101`	`1101`	`SPI_cursor_fetch(portal, true,100);`
`1102`	`1102`
`1103`		`-if (SPI_tuptable->tupdesc->natts!=1\|\|`
	`1103`	`+if (SPI_tuptable==NULL\|\|`
	`1104`	`+SPI_tuptable->tupdesc->natts!=1\|\|`
`1104`	`1105`	`SPI_gettypeid(SPI_tuptable->tupdesc,1)!=TSVECTOROID)`
`1105`	`1106`	`ereport(ERROR,`
`1106`	`1107`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`

Comments

(0)