[mapserver-commits] [MapServer/MapServer] 8f5da1: Fix bug in msQueryByFilter when filter merging fails

[Even Rouault]

  Branch: refs/heads/main
  Home:   https://github.com/MapServer/MapServer
  Commit: 8f5da178b690bfcf57d44281ac26a4b6e835a088
      https://github.com/MapServer/MapServer/commit/8f5da178b690bfcf57d44281ac26a4b6e835a088
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2021-01-20 (Wed, 20 Jan 2021)

  Changed paths:
    M mapquery.c
    M msautotest/mspython/test_postgis.py

  Log Message:
  -----------
  Fix bug in msQueryByFilter when filter merging fails

mapserver crashes when an error occurs in msQueryByFilter (e.g. value of filteritem is not a column name in a shape file).
We have to restore filter and filteritem at exit.

Co-authored-by: =?UTF-8?q?Bj=C3=B6rn=20Boldt?= <mapscript at pixaweb.net>


  Commit: 5ea4228e6bb1c3d76eaeeffafdc94f3e1a82b882
      https://github.com/MapServer/MapServer/commit/5ea4228e6bb1c3d76eaeeffafdc94f3e1a82b882
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2021-01-20 (Wed, 20 Jan 2021)

  Changed paths:
    M mappostgis.cpp
    M msautotest/mspython/test_postgis.py

  Log Message:
  -----------
  PostGIS: fix crash when evaluating bad filter


  Commit: 2bc7f625d7ec45d8401aeb66ae908b5210acf83f
      https://github.com/MapServer/MapServer/commit/2bc7f625d7ec45d8401aeb66ae908b5210acf83f
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2021-01-21 (Thu, 21 Jan 2021)

  Changed paths:
    M mappostgis.cpp
    M mapquery.c
    M msautotest/mspython/test_postgis.py

  Log Message:
  -----------
  Merge pull request #6212 from rouault/5520_refreshed

Fix bug in msQueryByFilter


Compare: https://github.com/MapServer/MapServer/compare/421e2b9ac70f...2bc7f625d7ec