]> granicus.if.org Git - postgresql/commit
Prevent crash when ts_rewrite() replaces a non-top-level subtree with null.
authorTom Lane <tgl@sss.pgh.pa.us>
Sun, 11 Dec 2016 18:09:57 +0000 (13:09 -0500)
committerTom Lane <tgl@sss.pgh.pa.us>
Sun, 11 Dec 2016 18:09:57 +0000 (13:09 -0500)
commitc8bfe055be9c688d7084546245c59f7f12a7c606
treede1183051d43c1daf27db48c53a902911f5348a2
parentb90f2247e1fca1e4c55fbbbfbf9354e3864f3fbc
Prevent crash when ts_rewrite() replaces a non-top-level subtree with null.

When ts_rewrite()'s replacement argument is an empty tsquery, it's supposed
to simplify any operator nodes whose operand(s) become NULL; but it failed
to do that reliably, because dropvoidsubtree() only examined the top level
of the result tree.  Rather than make a second recursive pass, let's just
give the responsibility to dofindsubquery() to simplify while it's doing
the main replacement pass.  Per report from Andreas Seltenreich.

Artur Zakirov, with some cosmetic changes by me.  Back-patch to all
supported branches.

Discussion: https://postgr.es/m/8737i01dew.fsf@credativ.de
src/backend/utils/adt/tsquery_rewrite.c
src/test/regress/expected/tsearch.out
src/test/regress/sql/tsearch.sql