diff options
| author | Teodor Sigaev <teodor@sigaev.ru> | 2009-07-28 09:32:45 +0000 |
|---|---|---|
| committer | Teodor Sigaev <teodor@sigaev.ru> | 2009-07-28 09:32:45 +0000 |
| commit | fe37cbb841607f8499ec3d2950397e650a94bf0d (patch) | |
| tree | 86acd893d147e0b548080177680068ad3c081507 /src | |
| parent | def9d5f749a38396ae3a7961575124aefcd95564 (diff) | |
Fix incorrect cleanup of tsquery in ts_rewrite(). Per bug #4933 by
Aaron Marcuse-Kubitza <aaronmk@blackducksoftware.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/tsquery_rewrite.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/utils/adt/tsquery_rewrite.c b/src/backend/utils/adt/tsquery_rewrite.c index 89f11731dd4..729c878ecbd 100644 --- a/src/backend/utils/adt/tsquery_rewrite.c +++ b/src/backend/utils/adt/tsquery_rewrite.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.11 2008/01/01 19:45:53 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.11.2.1 2009/07/28 09:32:45 teodor Exp $ * *------------------------------------------------------------------------- */ @@ -215,12 +215,12 @@ dropvoidsubtree(QTNode *root) root->nchild = j; - if (root->valnode->operator.oper == OP_NOT && root->nchild == 0) + if (root->nchild == 0) { QTNFree(root); root = NULL; } - else if (root->nchild == 1) + else if (root->nchild == 1 && root->valnode->operator.oper != OP_NOT) { QTNode *nroot = root->child[0]; |