Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ include(CheckCSourceCompiles)

 set (MapServer_VERSION_MAJOR 7)
 set (MapServer_VERSION_MINOR 4)
-set (MapServer_VERSION_REVISION 1)
+set (MapServer_VERSION_REVISION 2)
 set (MapServer_VERSION_SUFFIX "")

 set(TARGET_VERSION_MAJOR ${MapServer_VERSION_MAJOR})

--- a/HISTORY.TXT
+++ b/HISTORY.TXT
@@ -12,6 +12,11 @@ For a complete change history, please see the Git log comments.  For more
 details about recent point releases, please see the online changelog at:
 http://mapserver.org/development/changelog/

+7.4.2 release (2019-9-13)
+-------------------------
+
+- No major changes, see detailed changelog for bug fixes
+
 7.4.1 release (2019-7-12)
 -------------------------


--- a/Makefile
+++ b/Makefile
-AUTOTEST_OPTS=-strict -q
+AUTOTEST_OPTS?=-strict -q
 PHP_MAPSCRIPT=build/mapscript/php/php_mapscript.so
 PYTHON_MAPSCRIPT_PATH=build/mapscript/python
 JAVA_MAPSCRIPT_PATH=build/mapscript/java
@@ -7,11 +7,11 @@ PERL_MAPSCRIPT_PATH=build/mapscript/perl
 BUILDPATH=../../build
 FLEX=flex
 YACC=yacc
-CMAKEFLAGS=-DCMAKE_C_FLAGS="--coverage" -DCMAKE_CXX_FLAGS="--coverage" \
+CMAKEFLAGS=-DCMAKE_C_FLAGS="--coverage ${CMAKE_C_FLAGS}" -DCMAKE_CXX_FLAGS="--coverage ${CMAKE_CXX_FLAGS}" \
 			  -DCMAKE_SHARED_LINKER_FLAGS="-lgcov" -DWITH_CLIENT_WMS=1 \
 			  -DWITH_CLIENT_WFS=1 -DWITH_KML=1 -DWITH_SOS=1 -DWITH_CSHARP=1 -DWITH_PHP=1 -DWITH_PERL=1 \
 			  -DWITH_PYTHON=1 -DWITH_JAVA=1 -DWITH_THREAD_SAFETY=1 -DWITH_FRIBIDI=1 -DWITH_FCGI=0 -DWITH_EXEMPI=1 \
-			  -DCMAKE_BUILD_TYPE=Release -DWITH_RSVG=1 -DWITH_CURL=1 -DWITH_HARFBUZZ=1 -DWITH_POINT_Z_M=1
+			  -DCMAKE_BUILD_TYPE=Release -DWITH_RSVG=1 -DWITH_CURL=1 -DWITH_HARFBUZZ=1 -DWITH_POINT_Z_M=1 ${EXTRA_CMAKEFLAGS}
 all: cmakebuild

 cmakebuild: lexer parser
@@ -69,6 +69,9 @@ test:  cmakebuild
 	@$(MAKE) $(MFLAGS)	csharp-testcase
 	@$(MAKE) $(MFLAGS)	perl-testcase

+asan_compatible_tests:  cmakebuild
+	@$(MAKE) $(MFLAGS)	wxs-testcase renderers-testcase misc-testcase gdal-testcase query-testcase
+	@./print-test-results.sh

 lexer: maplexer.c
 parser: mapparser.c

--- a/ci/travis/after_success.sh
+++ b/ci/travis/after_success.sh
+#!/bin/sh
+set -eu
+
+if [ "$BUILD_NAME" != "PHP_7.2_WITH_ASAN" ]; then
+    # Only run coverage when it is safe to do so (not on pull requests), and only on master branch
+    echo "$TRAVIS_SECURE_ENV_VARS"
+    echo "$TRAVIS_BRANCH"
+    sh -c 'if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "master"; then echo "run coverage"; ./run_code_coverage_upload.sh; fi'
+    coveralls --exclude renderers --exclude mapscript --exclude apache --exclude build/mapscript/mapscriptJAVA_wrap.c --exclude build/mapscript/mapscriptPYTHON_wrap.c --exclude shp2img.c --exclude legend.c --exclude scalebar.c --exclude msencrypt.c --exclude sortshp.c --exclude shptreevis.c --exclude shptree.c --exclude testexpr.c --exclude sym2img.c --exclude testcopy.c --exclude shptreetst.c --exclude tile4ms.c --extension .c --extension .cpp
+fi
--- a/ci/travis/before_install.sh
+++ b/ci/travis/before_install.sh
+#!/bin/sh
+set -eu
+
+sudo mv /etc/apt/sources.list.d/pgdg* /tmp
+dpkg -l | grep postgresql
+dpkg -l | grep postgis
+sudo apt-get remove postgresql*
+sudo add-apt-repository -y ppa:ubuntugis/ppa
+sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-testing
+sudo apt-get update
+sudo apt-get install --allow-unauthenticated protobuf-c-compiler libprotobuf-c0-dev bison flex python-lxml libfribidi-dev cmake librsvg2-dev colordiff libpq-dev libpng12-dev libjpeg-dev libgif-dev libgeos-dev libgd2-xpm-dev libfreetype6-dev libfcgi-dev libcurl4-gnutls-dev libcairo2-dev libgdal1-dev libproj-dev libxml2-dev python-dev libexempi-dev lcov lftp postgis libharfbuzz-dev gdal-bin ccache
+sudo apt-get install --allow-unauthenticated libmono-system-drawing4.0-cil mono-mcs
+sudo apt-get install --allow-unauthenticated php5-dev || sudo apt-get install --allow-unauthenticated php7-dev
+sudo apt-get install --allow-unauthenticated libperl-dev
+sudo pip install git+git://github.com/tbonfort/cpp-coveralls.git@extensions
+# install swig 3.0.12 (defaults to 2.0.11 on trusty)
+wget http://prdownloads.sourceforge.net/swig/swig-3.0.12.tar.gz
+export CC="ccache gcc"
+export CXX="ccache g++"
+tar xf swig-3.0.12.tar.gz
+cd swig-3.0.12 && ./configure --prefix=/usr && make -j2 && sudo make install
+swig -version
+cd ..
+cd msautotest
+./create_postgis_test_data.sh
+python -m SimpleHTTPServer &> /dev/null &
+cd ..
+touch maplexer.l
+touch mapparser.y
--- a/ci/travis/script.sh
+++ b/ci/travis/script.sh
+#!/bin/sh
+set -eu
+
+if [ "$BUILD_NAME" = "PHP_7.2_WITH_ASAN" ]; then
+    export CC="ccache clang"
+    export CXX="ccache clang++"
+    # -DNDEBUG to avoid issues with cairo cleanup
+    make cmakebuild MFLAGS="-j2" CMAKE_C_FLAGS="-g -fsanitize=address -DNDEBUG" CMAKE_CXX_FLAGS="-g -fsanitize=address -DNDEBUG" EXTRA_CMAKEFLAGS="-DCMAKE_BUILD_TYPE=None -DCMAKE_EXE_LINKER_FLAGS=-fsanitize=address"
+    export AUTOTEST_OPTS="-q -strict -run_under_asan"
+    # Only run tests that only involve mapserv/shp2img binaries. mspython, etc would require LD_PREOLOAD'ing the asan shared object
+    make -j4 asan_compatible_tests
+else
+    export CC="ccache gcc"
+    export CXX="ccache g++"
+    make cmakebuild MFLAGS="-j2"
+    make mspython-wheel
+    make -j4 test
+fi
--- a/debian/changelog
+++ b/debian/changelog
+mapserver (7.4.2-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update 7.4.1 symbols for other architectures.
+  * Update 7.4.2 symbols for amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 14 Sep 2019 07:55:23 +0200
+
 mapserver (7.4.1-1) unstable; urgency=medium

  * New upstream release.

--- a/debian/libmapserver2.symbols
+++ b/debian/libmapserver2.symbols
-# SymbolsHelper-Confirmed: 7.4.0 amd64 ppc64
+# SymbolsHelper-Confirmed: 7.4.2 amd64
 libmapserver.so.2 #PACKAGE# #MINVER#
 * Build-Depends-Package: libmapserver-dev
 BuildExpressionTree@Base 6.2.1
@@ -190,7 +190,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
 _ZN10ClipperLib17E2InsertsBeforeE1ERNS_5TEdgeES1_@Base 6.2.1
 _ZN10ClipperLib17FindAppendLinkEndEPNS_6OutRecE@Base 6.2.1
 _ZN10ClipperLib17GetOverlapSegmentENS_8IntPointES0_S0_S0_RS0_S1_@Base 6.2.1
- (arch=armel armhf i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe)_ZN10ClipperLib17PolyOffsetBuilder8DoSquareEd@Base 7.2.2
+ _ZN10ClipperLib17PolyOffsetBuilder8DoSquareEd@Base 7.4.1
 _ZN10ClipperLib17PolyOffsetBuilderC1ERKSt6vectorIS1_INS_8IntPointESaIS2_EESaIS4_EERS6_dNS_8JoinTypeEd@Base 6.2.1
 _ZN10ClipperLib17PolyOffsetBuilderC2ERKSt6vectorIS1_INS_8IntPointESaIS2_EESaIS4_EERS6_dNS_8JoinTypeEd@Base 6.2.1
 _ZN10ClipperLib18GetNextNonDupOutPtEPNS_5OutPtERS1_@Base 6.2.1
@@ -204,7 +204,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
 _ZN10ClipperLib4TopXERNS_5TEdgeEx@Base 6.2.1
 _ZN10ClipperLib5GetDxENS_8IntPointES0_@Base 6.2.1
 _ZN10ClipperLib5SetDxERNS_5TEdgeE@Base 6.2.1
- (arch=armel armhf i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe)_ZN10ClipperLib6Int1286NegateERS0_@Base 7.2.2
 _ZN10ClipperLib7Clipper10ClearJoinsEv@Base 6.2.1
 _ZN10ClipperLib7Clipper11AddHorzJoinEPNS_5TEdgeEi@Base 6.2.1
 _ZN10ClipperLib7Clipper11BuildResultERSt6vectorIS1_INS_8IntPointESaIS2_EESaIS4_EE@Base 6.2.1
@@ -313,8 +312,8 @@ libmapserver.so.2 #PACKAGE# #MINVER#
 _ZN11KmlRendererD0Ev@Base 6.4.0
 _ZN11KmlRendererD1Ev@Base 6.4.0
 _ZN11KmlRendererD2Ev@Base 6.4.0
- (arch=!amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN12AGG2RendererD1Ev@Base 7.2.2
- (arch=!amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZN12AGG2RendererD2Ev@Base 7.2.2
+ _ZN12AGG2RendererD1Ev@Base 7.4.1
+ _ZN12AGG2RendererD2Ev@Base 7.4.1
 _ZN12line_adaptor6vertexEPdS0_@Base 6.2.1
 _ZN12line_adaptorD0Ev@Base 6.2.1
 _ZN12line_adaptorD1Ev@Base 6.2.1
@@ -487,11 +486,11 @@ libmapserver.so.2 #PACKAGE# #MINVER#
 (optional=templinst)_ZN9mapserver19comp_op_rgba_screenINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj@Base 7.0.0
 (optional=templinst)_ZN9mapserver19comp_op_rgba_src_inINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj@Base 7.0.0
 (optional=templinst)_ZN9mapserver19rasterizer_cells_aaINS_7cell_aaEE10sort_cellsEv@Base 7.0.0
- (optional=templinst)_ZN9mapserver19rasterizer_cells_aaINS_7cell_aaEE12render_hlineEiiiii@Base 6.2.1
 (optional=templinst)_ZN9mapserver19rasterizer_cells_aaINS_7cell_aaEE14allocate_blockEv@Base 6.4.0
 (optional=templinst)_ZN9mapserver19rasterizer_cells_aaINS_7cell_aaEE4lineEiiii@Base 6.2.1
 (optional=templinst)_ZN9mapserver19rasterizer_cells_aaINS_7cell_aaEED1Ev@Base 6.2.1
 (optional=templinst)_ZN9mapserver19rasterizer_cells_aaINS_7cell_aaEED2Ev@Base 6.2.1
+ (optional=templinst)_ZN9mapserver19scanline_storage_aaIhE6renderINS_11scanline_u8EEEvRKT_@Base 7.4.1
 (optional=templinst)_ZN9mapserver19scanline_storage_aaIhED1Ev@Base 6.2.1
 (optional=templinst)_ZN9mapserver19scanline_storage_aaIhED2Ev@Base 6.2.1
 (optional=templinst)_ZN9mapserver20comp_op_rgba_dst_outINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj@Base 7.0.0
@@ -525,6 +524,9 @@ libmapserver.so.2 #PACKAGE# #MINVER#
 (optional=templinst)_ZN9mapserver23comp_op_rgba_hard_lightINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj@Base 7.0.0
 (optional=templinst)_ZN9mapserver23comp_op_rgba_invert_rgbINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj@Base 7.0.0
 (optional=templinst)_ZN9mapserver23comp_op_rgba_soft_lightINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj@Base 7.0.0
+ (optional=templinst)_ZN9mapserver23line_interpolator_imageINS_22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS5_EEEEEEE8step_horEv@Base 7.4.1
+ (optional=templinst)_ZN9mapserver23line_interpolator_imageINS_22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS5_EEEEEEEC1ERSG_RKNS_15line_parametersEiiiiid@Base 7.4.1
+ (optional=templinst)_ZN9mapserver23line_interpolator_imageINS_22renderer_outline_imageINS_13renderer_baseINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEEEENS_18line_image_patternINS_28pattern_filter_bilinear_rgbaIS5_EEEEEEEC2ERSG_RKNS_15line_parametersEiiiiid@Base 7.4.1
 (optional=templinst)_ZN9mapserver24comp_op_rgba_color_dodgeINS_5rgba8ENS_10order_bgraEE9blend_pixEPhjjjjj@Base 7.0.0
 _ZN9mapserver25font_engine_freetype_base10resolutionEj@Base 6.2.1
 _ZN9mapserver25font_engine_freetype_base11add_kerningEjjPdS1_@Base 6.2.1
@@ -544,7 +546,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
 _ZN9mapserver25font_engine_freetype_baseD1Ev@Base 6.2.1
 _ZN9mapserver25font_engine_freetype_baseD2Ev@Base 6.2.1
 (optional=templinst)_ZN9mapserver25render_scanline_bin_solidINS_12scanline_binENS_13renderer_baseI10pixfmt_utfI8utfpix32NS_13row_ptr_cacheIjEELj1ELj0EEEES4_EEvRKT_RT0_RKT1_@Base 7.0.0
- (optional=templinst)_ZN9mapserver28pattern_filter_bilinear_rgbaINS_5rgba8EE14pixel_high_resEPKPKS1_PS1_ii@Base 7.0.2
+ (optional=templinst)_ZN9mapserver36span_image_filter_rgba_bilinear_clipINS_23pixfmt_alpha_blend_rgbaINS_16blender_rgba_preINS_5rgba8ENS_10order_bgraEEENS_12row_accessorIhEEjEENS_24span_interpolator_linearINS_12trans_affineELj8EEEE8generateEPS3_iij@Base 7.4.1
 _ZN9mapserver3arc19approximation_scaleEd@Base 6.2.1
 _ZN9mapserver3arc4initEddddddb@Base 6.2.1
 _ZN9mapserver3arc6rewindEj@Base 6.2.1
@@ -573,7 +575,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
 _ZN9mapserver9verdana18E@Base 6.2.1
 _ZNK10ClipperLib16clipperException4whatEv@Base 6.2.1
 (arch=sparc)_ZNK10ClipperLib6Int128dvERKS0_@Base 6.4.1
- (arch=!amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sh4 !sparc64)_ZNK10ClipperLib6Int128mlERKS0_@Base 7.0.2
 _ZNK10ClipperLib7Clipper14IsContributingERKNS_5TEdgeE@Base 6.2.1
 _ZNK10ClipperLib7Clipper17IsEvenOddFillTypeERKNS_5TEdgeE@Base 6.2.1
 _ZNK10ClipperLib7Clipper20IsEvenOddAltFillTypeERKNS_5TEdgeE@Base 6.2.1
@@ -592,7 +593,7 @@ libmapserver.so.2 #PACKAGE# #MINVER#
 _ZNK9mapserver25font_engine_freetype_base9find_faceEPKc@Base 6.2.1
 _ZNK9mapserver25font_engine_freetype_base9num_facesEv@Base 6.2.1
 (optional=templinst|arch=!amd64 !arm64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE17_M_default_appendEj@Base 7.0.2
- (optional=templinst)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE17_M_default_appendEm@Base 7.4.0~rc1
+ (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZNSt6vectorIN10ClipperLib11DoublePointESaIS1_EE17_M_default_appendEm@Base 7.4.0~rc1
 (optional=templinst|arch=!amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE17_M_default_appendEj@Base 7.0.2
 (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE17_M_default_appendEm@Base 7.0.2
 (optional=templinst)_ZNSt6vectorIN10ClipperLib8IntPointESaIS1_EE17_M_realloc_insertIJRKS1_EEEvN9__gnu_cxx17__normal_iteratorIPS1_S3_EEDpOT_@Base 7.0.7
@@ -605,11 +606,12 @@ libmapserver.so.2 #PACKAGE# #MINVER#
 (optional=templinst)_ZNSt6vectorIP10msExprNodeSaIS1_EE9push_backERKS1_@Base 7.0.5
 (optional=templinst)_ZNSt6vectorIP10msExprNodeSaIS1_EEaSERKS3_@Base 7.0.5
 (optional=templinst|arch=armel armhf i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_default_appendEj@Base 7.2.0
- (optional=templinst)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_default_appendEm@Base 7.4.0~rc1
+ (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_default_appendEm@Base 7.4.0~rc1
+ (optional=templinst)_ZNSt6vectorIPN10ClipperLib11HorzJoinRecESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 7.4.1
 (optional=templinst)_ZNSt6vectorIPN10ClipperLib5TEdgeESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 7.0.7
 (optional=templinst)_ZNSt6vectorIPN10ClipperLib6OutRecESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 7.0.7
 (optional=templinst|arch=armel armhf i386 kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sh4)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE17_M_default_appendEj@Base 7.2.0
- (optional=templinst)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE17_M_default_appendEm@Base 7.4.0~rc1
+ (optional=templinst|arch=!armel !armhf !i386 !m68k !mipsel !powerpc)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE17_M_default_appendEm@Base 7.4.0~rc1
 (optional=templinst)_ZNSt6vectorIPN10ClipperLib7JoinRecESaIS2_EE17_M_realloc_insertIJRKS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 7.2.0
 (optional=templinst|arch=!amd64 !arm64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EE17_M_default_appendEj@Base 7.0.2
 (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIS_IN10ClipperLib8IntPointESaIS1_EESaIS3_EE17_M_default_appendEm@Base 7.0.2
@@ -647,20 +649,8 @@ libmapserver.so.2 #PACKAGE# #MINVER#
 _ZTVN10ClipperLib16clipperExceptionE@Base 6.2.1
 _ZTVN10ClipperLib7ClipperE@Base 6.2.1
 _get_param_value@Base 7.0.0
- _msMetadataGetCharacterString@Base 7.2.0
 _msMetadataGetCodeList@Base 7.2.0
 _msMetadataGetContact@Base 7.2.0
- _msMetadataGetDate@Base 7.2.0
- _msMetadataGetDecimal@Base 7.2.0
- _msMetadataGetDistributionInfo@Base 7.2.0
- _msMetadataGetExtent@Base 7.2.0
- _msMetadataGetGMLTimePeriod@Base 7.2.0
- _msMetadataGetIdentificationInfo@Base 7.2.0
- _msMetadataGetInteger@Base 7.2.0
- _msMetadataGetOnline@Base 7.2.0
- _msMetadataGetReferenceSystemInfo@Base 7.2.0
- _msMetadataGetSpatialRepresentationInfo@Base 7.2.0
- _msMetadataGetURL@Base 7.2.0
 _msSLDParseSizeParameter@Base 6.2.1
 _msValidateTime@Base 6.2.1
 _ms_script_prefix_am@Base 7.0.0
@@ -1522,8 +1512,6 @@ libmapserver.so.2 #PACKAGE# #MINVER#
 msMetadataCreateParamsObj@Base 7.2.0
 msMetadataDispatch@Base 7.2.0
 msMetadataFreeParamsObj@Base 7.2.0
- msMetadataGetExceptionReport@Base 7.2.0
- msMetadataGetLayerMetadata@Base 7.2.0
 msMetadataParseRequest@Base 7.2.0
 msMetadataSetGetMetadataURL@Base 7.2.0
 msMoveClassDown@Base 6.2.1

--- a/mapcopy.c
+++ b/mapcopy.c
@@ -204,10 +204,12 @@ int msCopyFontSet(fontSetObj *dst, fontSetObj *src, mapObj *map)

 int msCopyExpression(expressionObj *dst, expressionObj *src)
 {
+  if((dst->type == MS_REGEX) && dst->compiled) ms_regfree(&(dst->regex));
+  dst->compiled = MS_FALSE;
+
  MS_COPYSTRING(dst->string, src->string);
  MS_COPYSTELEM(type);
  MS_COPYSTELEM(flags);
-  dst->compiled = MS_FALSE;

  return MS_SUCCESS;
 }

--- a/mapfile.c
+++ b/mapfile.c
@@ -6512,6 +6512,7 @@ static int loadMapInternal(mapObj *map)
        if(getInteger(&(map->imagequality)) == -1) return MS_FAILURE;
        break;
      case(IMAGETYPE):
+        msFree(map->imagetype);
        map->imagetype = getToken();
        break;
      case(INTERLACE):
@@ -6879,6 +6880,7 @@ int msUpdateMapFromURL(mapObj *map, char *variable, char *string)

          /* TODO: should validate or does msPostMapParseOutputFormatSetup() do enough? */

+          msFree(map->imagetype);
          map->imagetype = getToken();
          msPostMapParseOutputFormatSetup( map );
          break;

--- a/mapgdal.c
+++ b/mapgdal.c
@@ -105,10 +105,6 @@ void msGDALCleanup( void )
    while( iRepeat-- )
      CPLPopErrorHandler();

-#if GDAL_RELEASE_DATE > 20021001
-    GDALDestroyDriverManager();
-#endif
-
    msReleaseLock( TLOCK_GDAL );

    bGDALInitialized = 0;

--- a/maplabel.c
+++ b/maplabel.c
@@ -251,8 +251,11 @@ int msAddLabelGroup(mapObj *map, imageObj *image, layerObj* layer, int classinde
    msPopulateTextSymbolForLabelAndString(ts,lbl,annotext,layerPtr->scalefactor,image->resolutionfactor, 1);

    if(annotext && *annotext && lbl->autominfeaturesize && featuresize > 0) {
-      if(UNLIKELY(MS_FAILURE == msComputeTextPath(map,ts)))
+      if(UNLIKELY(MS_FAILURE == msComputeTextPath(map,ts))) {
+        freeTextSymbol(ts);
+        free(ts);
        return MS_FAILURE;
+      }
      if(featuresize < (ts->textpath->bounds.bbox.maxx - ts->textpath->bounds.bbox.minx)) {
        /* feature is too big to be drawn, skip it */
        freeTextSymbol(ts);

--- a/maplayer.c
+++ b/maplayer.c
@@ -2106,7 +2106,7 @@ msINLINELayerInfo;

 int msINLINELayerIsOpen(layerObj *layer)
 {
-  if (layer->currentfeature)
+  if (layer->layerinfo)
    return(MS_TRUE);
  else
    return(MS_FALSE);
@@ -2227,6 +2227,7 @@ int msINLINELayerNextShape(layerObj *layer, shapeObj *shape)
        shape->values = (char **)msSmallRealloc(shape->values, sizeof(char *)*(layer->numitems));
        for (i = shape->numvalues; i < layer->numitems; i++)
          shape->values[i] = msStrdup("");
+        shape->numvalues = layer->numitems;
      }

      break;

--- a/maplexer.c
+++ b/maplexer.c
--- a/maplexer.l
+++ b/maplexer.l
+%option never-interactive
+
 %{
 /*
 ** READ ME FIRST!
@@ -45,7 +47,7 @@ int msyystate=MS_TOKENIZE_DEFAULT;
 char *msyystring=NULL;
 char *msyybasepath=NULL;
 char *msyystring_buffer_ptr;
-int  msyystring_buffer_size = 256;
+int  msyystring_buffer_size = 0;
 int  msyystring_size;
 char msyystring_begin;
 char *msyystring_buffer = NULL;
@@ -88,10 +90,12 @@ char path[MS_MAXPATHLEN];

 %%
       if (msyystring_buffer == NULL)
+       {
+           msyystring_buffer_size = 256;
           msyystring_buffer = (char*) msSmallMalloc(sizeof(char) * msyystring_buffer_size);
+       }

       msyystring_buffer[0] = '\0';
-       msyystring_buffer_size = 0;
       switch(msyystate) {
       case(MS_TOKENIZE_DEFAULT):
         break;

--- a/mapmetadata.c
+++ b/mapmetadata.c
--- a/mapmssql2008.c
+++ b/mapmssql2008.c
@@ -1181,7 +1181,7 @@ int msMSSQL2008LayerGetExtent(layerObj *layer, rectObj *extent)
        query = msStringConcatenate(query, "WITH extent(extentcol) AS (SELECT geometry::EnvelopeAggregate(");
        query = msStringConcatenate(query, layerinfo->geom_column);        
      }
-      query = msStringConcatenate(query, ".MakeValid()) AS extentcol FROM ");
+      query = msStringConcatenate(query, ") AS extentcol FROM ");
      query = msStringConcatenate(query, layerinfo->geom_table);
      query = msStringConcatenate(query, ") SELECT extentcol.STPointN(1).STX, extentcol.STPointN(1).STY, extentcol.STPointN(3).STX, extentcol.STPointN(3).STY FROM extent");
    }
@@ -1197,7 +1197,7 @@ int msMSSQL2008LayerGetExtent(layerObj *layer, rectObj *extent)
        query = msStringConcatenate(query, "WITH ENVELOPE as (SELECT ");
        query = msStringConcatenate(query, layerinfo->geom_column);      
      }
-      query = msStringConcatenate(query, ".MakeValid().STEnvelope() as envelope from ");
+      query = msStringConcatenate(query, ".STEnvelope() as envelope from ");
      query = msStringConcatenate(query, layerinfo->geom_table);
      query = msStringConcatenate(query, "), CORNERS as (SELECT envelope.STPointN(1) as point from ENVELOPE UNION ALL select envelope.STPointN(3) from ENVELOPE) SELECT MIN(point.STX), MIN(point.STY), MAX(point.STX), MAX(point.STY) FROM CORNERS");
    }
@@ -1502,7 +1502,7 @@ static int prepare_database(layerObj *layer, rectObj rect, char **query_string)
      query = msStringConcatenate(query, " AND ");

  query = msStringConcatenate(query, layerinfo->geom_column);
-  query = msStringConcatenate(query, ".MakeValid().STIntersects(");
+  query = msStringConcatenate(query, ".STIntersects(");
  query = msStringConcatenate(query, box3d);
  query = msStringConcatenate(query, ") = 1 ");

@@ -2988,6 +2988,8 @@ int process_node(layerObj* layer, expressionObj *filter)
          i++;
          continue;
        }
+        if( c == '$' && c_next == 0 && strtmpl[0] == '^' )
+          break;

        if (c == '\\') {
          i++;

--- a/mapogcsld.c
+++ b/mapogcsld.c
@@ -61,8 +61,8 @@ static inline void IGUR_sizet(size_t ignored) { (void)ignored; }  /* Ignore GCC
 /*      on the map. Layer name and Named Layer's name parameter are     */
 /*      used to do the match.                                           */
 /************************************************************************/
-int msSLDApplySLDURL(mapObj *map, char *szURL, int iLayer,
-                     char *pszStyleLayerName,  char **ppszLayerNames)
+int msSLDApplySLDURL(mapObj *map, const char *szURL, int iLayer,
+                     const char *pszStyleLayerName,  char **ppszLayerNames)
 {
 #ifdef USE_OGR

@@ -116,6 +116,8 @@ int msSLDApplySLDURL(mapObj *map, char *szURL, int iLayer,
    }
  }

+  msFree(pszSLDbuf);
+
  return nStatus;

 #else
@@ -143,7 +145,7 @@ int msSLDApplySLDURL(mapObj *map, char *szURL, int iLayer,
 /*      they have the same name, copy the classes asscoaited with       */
 /*      the SLD layers onto the map layers.                             */
 /************************************************************************/
-int msSLDApplySLD(mapObj *map, char *psSLDXML, int iLayer, char *pszStyleLayerName, char **ppszLayerNames)
+int msSLDApplySLD(mapObj *map, const char *psSLDXML, int iLayer, const char *pszStyleLayerName, char **ppszLayerNames)
 {
 #if defined(USE_WMS_SVR) || defined (USE_WFS_SVR) || defined (USE_WCS_SVR) || defined(USE_SOS_SVR)

@@ -486,7 +488,7 @@ sld_cleanup:
 /*      Returns an array of mapserver layers. The pnLayres if           */
 /*      provided will indicate the size of the returned array.          */
 /************************************************************************/
-layerObj  *msSLDParseSLD(mapObj *map, char *psSLDXML, int *pnLayers)
+layerObj  *msSLDParseSLD(mapObj *map, const char *psSLDXML, int *pnLayers)
 {
  CPLXMLNode *psRoot = NULL;
  CPLXMLNode *psSLD, *psNamedLayer, *psChild, *psName;
@@ -924,6 +926,7 @@ int msSLDParseNamedLayer(CPLXMLNode *psRoot, layerObj *psLayer)
        char* pszExpression = msSLDGetCommonExpressionFromFilter(psFilter,
                                                                    psLayer);
        if (pszExpression) {
+            msFreeExpression(&psLayer->filter);
            msInitExpression(&psLayer->filter);
            psLayer->filter.string = pszExpression;
            psLayer->filter.type = MS_EXPRESSION;

--- a/mapogcsld.h
+++ b/mapogcsld.h
@@ -29,10 +29,10 @@
 #include "mapserver.h"

 MS_DLL_EXPORT char *msSLDGenerateSLD(mapObj *map, int iLayer, const char *pszVersion);
-MS_DLL_EXPORT int msSLDApplySLDURL(mapObj *map, char *szURL, int iLayer,
-                                   char *pszStyleLayerName, char **ppszLayerNames);
-MS_DLL_EXPORT int msSLDApplySLD(mapObj *map, char *psSLDXML, int iLayer,
-                                char *pszStyleLayerName, char **ppszLayerNames);
+MS_DLL_EXPORT int msSLDApplySLDURL(mapObj *map, const char *szURL, int iLayer,
+                                   const char *pszStyleLayerName, char **ppszLayerNames);
+MS_DLL_EXPORT int msSLDApplySLD(mapObj *map, const char *psSLDXML, int iLayer,
+                                const char *pszStyleLayerName, char **ppszLayerNames);

 #ifdef USE_OGR

@@ -43,7 +43,7 @@ MS_DLL_EXPORT int msSLDApplySLD(mapObj *map, char *psSLDXML, int iLayer,
 /* -------------------------------------------------------------------- */
 /*      prototypes.                                                     */
 /* -------------------------------------------------------------------- */
-layerObj  *msSLDParseSLD(mapObj *map, char *psSLDXML, int *pnLayers);
+layerObj  *msSLDParseSLD(mapObj *map, const char *psSLDXML, int *pnLayers);
 int msSLDParseNamedLayer(CPLXMLNode *psRoot, layerObj *layer);
 int msSLDParseRule(CPLXMLNode *psRoot, layerObj *psLayer);
 int msSLDParseStroke(CPLXMLNode *psStroke, styleObj *psStyle,

--- a/mapogcsos.c
+++ b/mapogcsos.c
@@ -1713,10 +1713,8 @@ int msSOSGetObservation(mapObj *map, sosParamsObj *sosparams, cgiRequestObj *req
  xmlNodePtr psObservationNode = NULL, psResultNode=NULL;
  const char *pszProcedure = NULL;
  const char *pszBlockSep=NULL;
-  char *pszResult=NULL;
  int nDiffrentProc = 0;
  SOSProcedureNode *paDiffrentProc = NULL;
-  char *pszProcedureValue = NULL;
  int iItemPosition, status;
  shapeObj sShape;
  char* pszEscapedStr = NULL;
@@ -2303,6 +2301,7 @@ this request. Check sos/ows_enable_request settings.", "msSOSGetObservation()",
    if (tokens==NULL || n != 4) {
      msSetError(MS_SOSERR, "Wrong number of arguments for sos_offering_extent.",
                 "msSOSGetCapabilities()");
+      msFree(script_url);
      return msSOSException(map, "sos_offering_extent", "InvalidParameterValue");
    }

@@ -2314,6 +2313,7 @@ this request. Check sos/ows_enable_request settings.", "msSOSGetObservation()",
    if (map && msProjectionsDiffer(&map->projection, &lp->projection) == MS_TRUE) {
      if (msProjectRect(&lp->projection, &map->projection, &envelope) == MS_FAILURE) {
        msSetError(MS_SOSERR, "Coordinates transformation failed.  Raised in msProjectRect() of file %s line %d", "msSOSGetCapabilities()", __FILE__, __LINE__);
+        msFree(script_url);
        return msSOSException(map, "sos_offering_extent", "InvalidParameterValue");
      }
    }
@@ -2352,6 +2352,14 @@ this request. Check sos/ows_enable_request settings.", "msSOSGetObservation()",
    msSetError(MS_SOSERR, "resultModel should be om:Measurement or om:Observation", "msSOSGetObservation()");
    free(xsi_schemaLocation);
    free(schemalocation);
+    msFree(script_url);
+    xmlFreeNs(psNsSos);
+    xmlFreeNs(psNsGml);
+    xmlFreeNs(psNsOm);
+    xmlFreeNs(psNsSwe);
+    xmlFreeNs(psNsXLink);
+    xmlFreeNs(psNsMs);
+    xmlFreeDoc(psDoc);
    return msSOSException(map, "resultModel", "InvalidParameterValue");
  }

@@ -2391,22 +2399,29 @@ this request. Check sos/ows_enable_request settings.", "msSOSGetObservation()",
                else
                  xmlNodeAddContent(psResultNode, BAD_CAST "\n");
              }
-              pszResult = msSOSReturnMemberResult((GET_LAYER(map, i)), j, NULL);
+              {
+                char* pszResult = msSOSReturnMemberResult((GET_LAYER(map, i)), j, NULL);
                if (pszResult) {
                  xmlNodeAddContent(psResultNode, BAD_CAST pszResult);
                  msFree(pszResult);
                }
              }
            }
+          }
          /*this is the case where procedure_item is used. Needs more management since
            the same data on a layer contains different procedures (procedures are
            one of the fields of the record)*/
          else {

            for(j=0; j<GET_LAYER(map, i)->resultcache->numresults; j++) {
-              pszResult = msSOSReturnMemberResult((GET_LAYER(map, i)), j, &pszProcedureValue);
+              char* pszProcedureValue = NULL;
+              char* pszResult = msSOSReturnMemberResult((GET_LAYER(map, i)), j, &pszProcedureValue);
              if (!pszProcedureValue || !pszResult)
+              {
+                msFree(pszProcedureValue);
+                msFree(pszResult);
                continue;
+              }
              for (k=0; k<nDiffrentProc; k++) {
                if (strcasecmp(paDiffrentProc[k].pszProcedure, pszProcedureValue) == 0) {
                  pszBlockSep = msOWSLookupMetadata(&(map->web.metadata), "S",
@@ -2432,14 +2447,14 @@ this request. Check sos/ows_enable_request settings.", "msSOSGetObservation()",
                psObservationNode = msSOSAddMemberNodeObservation(psNsGml, psNsSos, psNsOm, psNsSwe, psNsXLink, psRootNode, map,
                                    (GET_LAYER(map, i)),
                                    pszProcedureValue);
-                msFree(pszProcedureValue);

                paDiffrentProc[nDiffrentProc-1].psResultNode =
                  xmlNewChild(psObservationNode, NULL, BAD_CAST "result", NULL);

                xmlNodeAddContent(paDiffrentProc[nDiffrentProc-1].psResultNode, BAD_CAST pszResult);
-                msFree(pszResult);
              }
+              msFree(pszProcedureValue);
+              msFree(pszResult);
            }
            if (paDiffrentProc) {
              for (k=0; k<nDiffrentProc; k++)