Fix incorrect cleanup of tsquery in ts_rewrite(). Per bug #4933 by

feodor · feodor · commit 1f4b046c188c · 2009-07-28T09:31:55.000Z
Aaron Marcuse-Kubitza &lt;aaronmk@blackducksoftware.com&gt;
diff --git 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.15 2009/07/16 06:33:44 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.16 2009/07/28 09:31:55 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -217,12 +217,12 @@ dropvoidsubtree(QTNode *root)
 
 		root->nchild = j;
 
-		if (root->valnode->qoperator.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->qoperator.oper != OP_NOT)
 		{
 			QTNode	   *nroot = root->child[0];
 

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.15 2009/07/16 06:33:44 petere Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/tsquery_rewrite.c,v 1.16 2009/07/28 09:31:55 teodor Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -217,12 +217,12 @@ dropvoidsubtree(QTNode *root)`
`217`	`217`
`218`	`218`	`root->nchild = j;`
`219`	`219`
`220`		`- if (root->valnode->qoperator.oper == OP_NOT && root->nchild == 0)`
	`220`	`+ if (root->nchild == 0)`
`221`	`221`	`{`
`222`	`222`	`QTNFree(root);`
`223`	`223`	`root = NULL;`
`224`	`224`	`}`
`225`		`- else if (root->nchild == 1)`
	`225`	`+ else if (root->nchild == 1 && root->valnode->qoperator.oper != OP_NOT)`
`226`	`226`	`{`
`227`	`227`	`QTNode *nroot = root->child[0];`
`228`	`228`