mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 dereference
same.
This commit is contained in:
Tom Lane 2007-10-24 03:30:03 +00:00
parent 592c88a0d2
commit 1c92724985
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/utils/adt/tsquery_rewrite.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.6 2007/10/24 02:24:47 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.7 2007/10/24 03:30:03 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -259,7 +259,7 @@ tsquery_rewrite_query(PG_FUNCTION_ARGS)
MemoryContext oldcontext; MemoryContext oldcontext;
QTNode *tree; QTNode *tree;
char *buf; char *buf;
void *plan; SPIPlanPtr plan;
Portal portal; Portal portal;
bool isnull; bool isnull;
int i; int i;
@ -281,12 +281,13 @@ tsquery_rewrite_query(PG_FUNCTION_ARGS)
if ((plan = SPI_prepare(buf, 0, NULL)) == NULL) if ((plan = SPI_prepare(buf, 0, NULL)) == NULL)
elog(ERROR, "SPI_prepare(\"%s\") failed", buf); elog(ERROR, "SPI_prepare(\"%s\") failed", buf);
if ((portal = SPI_cursor_open(NULL, plan, NULL, NULL, false)) == NULL) if ((portal = SPI_cursor_open(NULL, plan, NULL, NULL, true)) == NULL)
elog(ERROR, "SPI_cursor_open(\"%s\") failed", buf); elog(ERROR, "SPI_cursor_open(\"%s\") failed", buf);
SPI_cursor_fetch(portal, true, 100); SPI_cursor_fetch(portal, true, 100);
if (SPI_tuptable->tupdesc->natts != 2 || if (SPI_tuptable == NULL ||
SPI_tuptable->tupdesc->natts != 2 ||
SPI_gettypeid(SPI_tuptable->tupdesc, 1) != TSQUERYOID || SPI_gettypeid(SPI_tuptable->tupdesc, 1) != TSQUERYOID ||
SPI_gettypeid(SPI_tuptable->tupdesc, 2) != TSQUERYOID) SPI_gettypeid(SPI_tuptable->tupdesc, 2) != TSQUERYOID)
ereport(ERROR, ereport(ERROR,

9
src/backend/utils/adt/tsvector_op.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.6 2007/10/23 00:51:23 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/tsvector_op.c,v 1.7 2007/10/24 03:30:03 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1088,19 +1088,20 @@ ts_stat_sql(text *txt, text *ws)
*stat; *stat;
bool isnull; bool isnull;
Portal portal; Portal portal;
void *plan; SPIPlanPtr plan;
if ((plan = SPI_prepare(query, 0, NULL)) == NULL) if ((plan = SPI_prepare(query, 0, NULL)) == NULL)
/* internal error */ /* internal error */
elog(ERROR, "SPI_prepare(\"%s\") failed", query); elog(ERROR, "SPI_prepare(\"%s\") failed", query);
if ((portal = SPI_cursor_open(NULL, plan, NULL, NULL, false)) == NULL) if ((portal = SPI_cursor_open(NULL, plan, NULL, NULL, true)) == NULL)
/* internal error */ /* internal error */
elog(ERROR, "SPI_cursor_open(\"%s\") failed", query); elog(ERROR, "SPI_cursor_open(\"%s\") failed", query);
SPI_cursor_fetch(portal, true, 100); SPI_cursor_fetch(portal, true, 100);
if (SPI_tuptable->tupdesc->natts != 1 || if (SPI_tuptable == NULL ||
SPI_tuptable->tupdesc->natts != 1 ||
SPI_gettypeid(SPI_tuptable->tupdesc, 1) != TSVECTOROID) SPI_gettypeid(SPI_tuptable->tupdesc, 1) != TSVECTOROID)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),