aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTeodor Sigaev <teodor@sigaev.ru>2008-01-15 17:16:01 +0000
committerTeodor Sigaev <teodor@sigaev.ru>2008-01-15 17:16:01 +0000
commitf7807f1de8c9ddf543d46c5c8e2d678456a685c4 (patch)
tree58972a8d5dfc74a039a0307b785bdcb55014b3a4 /src
parentdbdc2e52a0c3569c6237c0b675fc739968f015d9 (diff)
downloadpostgresql-f7807f1de8c9ddf543d46c5c8e2d678456a685c4.tar.gz
postgresql-f7807f1de8c9ddf543d46c5c8e2d678456a685c4.zip
Add check of headline method presence. Per report by Yoshiyuki Asaba <y-asaba@sraoss.co.jp>
Diffstat (limited to 'src')
-rw-r--r--src/backend/tsearch/wparser.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c
index a5ec35ac3cc..5e8528b43c8 100644
--- a/src/backend/tsearch/wparser.c
+++ b/src/backend/tsearch/wparser.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tsearch/wparser.c,v 1.6 2008/01/01 19:45:52 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/tsearch/wparser.c,v 1.7 2008/01/15 17:16:01 teodor Exp $
*
*-------------------------------------------------------------------------
*/
@@ -309,6 +309,11 @@ ts_headline_byid_opt(PG_FUNCTION_ARGS)
cfg = lookup_ts_config_cache(PG_GETARG_OID(0));
prsobj = lookup_ts_parser_cache(cfg->prsId);
+ if ( !OidIsValid( prsobj->headlineOid ) )
+ ereport(ERROR,
+ (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+ errmsg("Text parser doesn't support headline creation")));
+
memset(&prs, 0, sizeof(HeadlineParsedText));
prs.lenwords = 32;
prs.words = (HeadlineWordEntry *) palloc(sizeof(HeadlineWordEntry) * prs.lenwords);