[mapserver-commits] [mapserver/mapserver] bbe23e: oracle - fixing memory handling error

GitHub noreply at github.com
Tue Jan 24 04:11:57 PST 2017 

  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: bbe23e8c0b9cce174dc3ff313e3e5d3560c1e62b
      https://github.com/mapserver/mapserver/commit/bbe23e8c0b9cce174dc3ff313e3e5d3560c1e62b
  Author: Pierre Mauduit <pierre.mauduit at camptocamp.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M maporaclespatial.c

  Log Message:
  -----------
  oracle - fixing memory handling error

If the memory area pointed by table_name is too small, it is resized
multiplying its size by 2. But if this occurs, the tgt variable used in
the "for" loop continues to point on a memory area which might have become
invalid (because the realloc could have moved the memory somewhere else,
depending on how the OS manages the memory).

To fix this, in my understanding, the tgt pointer should be readjusted
to the new location pointed by table_name.

Running valgrind without my patch (sources based on the 7.0.1 version,
but the maporaclespatial.c is identical to master):

==1908== Invalid write of size 1
==1908==    at 0x4E81FEF: msSplitData (in /usr/lib/x86_64-linux-gnu/libmapserver.so.7.0.1)

Tests: runtime tested in a docker composition

Note: valgrinds continues to indicate some errors related to this msSplitData()
method:

==1945== 32,000 bytes in 1 blocks are definitely lost in loss record 264
of 268
==1945==    at 0x4C2AF2E: realloc (vg_replace_malloc.c:692)
==1945==    by 0x4EBDF4B: msSplitData (maporaclespatial.c:404)
==1945==    by 0x4EC90E0: msOracleSpatialLayerTranslateFilter (maporaclespatial.c:3499)

I wonder if in the context of msOracleSpatialLayerTranslateFilter(),
the pointers are still valid when they are actually freed at the end of
the method.


  Commit: 026847b1c962cdd666d28cfbe38ac40fff54ffbb
      https://github.com/mapserver/mapserver/commit/026847b1c962cdd666d28cfbe38ac40fff54ffbb
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M mapresample.c
    M msautotest/gdal/expected/average_rgb.png
    M msautotest/gdal/expected/average_rgb_plug.png
    M msautotest/gdal/expected/wmsclient_3543.png
    M msautotest/misc/expected/runtime_sub_test012.png
    M msautotest/misc/expected/runtime_sub_test013.png
    M msautotest/renderers/expected/average_rgb.cairo.png
    M msautotest/renderers/expected/average_rgb.pdf
    M msautotest/renderers/expected/average_rgb.png
    M msautotest/renderers/expected/average_rgb.svg
    M msautotest/renderers/expected/rgb_overlay_res.cairo.png
    M msautotest/renderers/expected/rgb_overlay_res.pdf
    M msautotest/renderers/expected/rgb_overlay_res.png
    M msautotest/renderers/expected/rgb_overlay_res.svg
    M msautotest/renderers/expected/rgb_overlay_res_to8bit.cairo.png
    M msautotest/renderers/expected/rgb_overlay_res_to8bit.pdf
    M msautotest/renderers/expected/rgb_overlay_res_to8bit.png
    M msautotest/renderers/expected/rgb_overlay_res_to8bit.svg
    M msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.cairo.png
    M msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.pdf
    M msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.png
    M msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.svg
    M msautotest/renderers/expected/rgba_overlay_res.cairo.png
    M msautotest/renderers/expected/rgba_overlay_res.pdf
    M msautotest/renderers/expected/rgba_overlay_res.png
    M msautotest/renderers/expected/rgba_overlay_res.svg
    M msautotest/renderers/expected/uvraster.cairo.png
    M msautotest/renderers/expected/uvraster.pdf
    M msautotest/renderers/expected/uvraster.png
    M msautotest/renderers/expected/uvraster.svg
    M msautotest/renderers/expected/uvraster_reproj.cairo.png
    M msautotest/renderers/expected/uvraster_reproj.pdf
    M msautotest/renderers/expected/uvraster_reproj.png
    M msautotest/renderers/expected/uvraster_reproj.svg
    M msautotest/wxs/expected/wcs11_post_getcov_gdpng8.dat
    M msautotest/wxs/expected/wcs11_post_getcov_grd_4326.dat
    M msautotest/wxs/expected/wcs11_post_getcov_grd_wgs84.dat
    M msautotest/wxs/expected/wcs_getcov_grd_11_4326.dat
    M msautotest/wxs/expected/wcs_getcov_grd_11_wgs84.dat
    M msautotest/wxs/expected/wcs_getcov_png8_11.dat

  Log Message:
  -----------
  msResampleGDALToMap(): fix issue that cause line pattern in image mosaic (#1715)


  Commit: ba9e11aaddd4828dfb9d13e295d42d082deb8a28
      https://github.com/mapserver/mapserver/commit/ba9e11aaddd4828dfb9d13e295d42d082deb8a28
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M mapresample.c
    M msautotest/gdal/expected/average_rgb.png
    M msautotest/gdal/expected/average_rgb_plug.png
    M msautotest/gdal/expected/wmsclient_3543.png
    M msautotest/misc/expected/runtime_sub_test012.png
    M msautotest/misc/expected/runtime_sub_test013.png
    M msautotest/renderers/expected/average_rgb.cairo.png
    M msautotest/renderers/expected/average_rgb.pdf
    M msautotest/renderers/expected/average_rgb.png
    M msautotest/renderers/expected/average_rgb.svg
    M msautotest/renderers/expected/rgb_overlay_res.cairo.png
    M msautotest/renderers/expected/rgb_overlay_res.pdf
    M msautotest/renderers/expected/rgb_overlay_res.png
    M msautotest/renderers/expected/rgb_overlay_res.svg
    M msautotest/renderers/expected/rgb_overlay_res_to8bit.cairo.png
    M msautotest/renderers/expected/rgb_overlay_res_to8bit.pdf
    M msautotest/renderers/expected/rgb_overlay_res_to8bit.png
    M msautotest/renderers/expected/rgb_overlay_res_to8bit.svg
    M msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.cairo.png
    M msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.pdf
    M msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.png
    M msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.svg
    M msautotest/renderers/expected/rgba_overlay_res.cairo.png
    M msautotest/renderers/expected/rgba_overlay_res.pdf
    M msautotest/renderers/expected/rgba_overlay_res.png
    M msautotest/renderers/expected/rgba_overlay_res.svg
    M msautotest/renderers/expected/uvraster.cairo.png
    M msautotest/renderers/expected/uvraster.pdf
    M msautotest/renderers/expected/uvraster.png
    M msautotest/renderers/expected/uvraster.svg
    M msautotest/renderers/expected/uvraster_reproj.cairo.png
    M msautotest/renderers/expected/uvraster_reproj.pdf
    M msautotest/renderers/expected/uvraster_reproj.png
    M msautotest/renderers/expected/uvraster_reproj.svg
    M msautotest/wxs/expected/wcs11_post_getcov_gdpng8.dat
    M msautotest/wxs/expected/wcs11_post_getcov_grd_4326.dat
    M msautotest/wxs/expected/wcs11_post_getcov_grd_wgs84.dat
    M msautotest/wxs/expected/wcs_getcov_grd_11_4326.dat
    M msautotest/wxs/expected/wcs_getcov_grd_11_wgs84.dat
    M msautotest/wxs/expected/wcs_getcov_png8_11.dat

  Log Message:
  -----------
  Merge branch 'fix_1715' into branch-7-0


  Commit: e0a3448f3f42d20a0d271709c8629a5b40d13951
      https://github.com/mapserver/mapserver/commit/e0a3448f3f42d20a0d271709c8629a5b40d13951
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M mapresample.c
    A msautotest/wxs/data/polar_stereo.tif
    A msautotest/wxs/expected/wms_polar_stereo.png
    A msautotest/wxs/wms_polar_stereo.map

  Log Message:
  -----------
  msResampleGDALToMap(): fix inappropriate cellsize computation when loading (well beyond) full source raster.


  Commit: f53fd782ccbe04033d4088047615f08968dcede0
      https://github.com/mapserver/mapserver/commit/f53fd782ccbe04033d4088047615f08968dcede0
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2017-01-20 (Fri, 20 Jan 2017)

  Changed paths:
    M mapogr.cpp
    M msautotest/valgrind-suppressions.txt

  Log Message:
  -----------
  [OGR] Translate as much as possible MapServer expressions to OGR SQL attribute and spatial filters

This should restore the level of performance to what is was in MapServer 6.4


  Commit: e075ccbd022bd44fdb31bdf2c9d563383c96cc7d
      https://github.com/mapserver/mapserver/commit/e075ccbd022bd44fdb31bdf2c9d563383c96cc7d
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M mapogcfilter.c

  Log Message:
  -----------
  Fix Character type handling in WMS dimension filters (#5374)


  Commit: cd36c08744788c0e26af61785eeb2fa99ac692b7
      https://github.com/mapserver/mapserver/commit/cd36c08744788c0e26af61785eeb2fa99ac692b7
  Author: Tamas Szekeres <szekerest at gmail.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M mapogcfilter.c

  Log Message:
  -----------
  Merge pull request #5375 from szekerest/wmsdimtype

Fix Character type handling in WMS dimension filters (#5374)


  Commit: df06a0a2146da91a7680bfbec30c4a55153fc09c
      https://github.com/mapserver/mapserver/commit/df06a0a2146da91a7680bfbec30c4a55153fc09c
  Author: Even Rouault <even.rouault at spatialys.com>
  Date:   2017-01-24 (Tue, 24 Jan 2017)

  Changed paths:
    M mapogcfilter.c
    M mapogr.cpp
    M maporaclespatial.c
    M mapresample.c
    M msautotest/gdal/expected/average_rgb.png
    M msautotest/gdal/expected/average_rgb_plug.png
    M msautotest/gdal/expected/wmsclient_3543.png
    M msautotest/misc/expected/runtime_sub_test012.png
    M msautotest/misc/expected/runtime_sub_test013.png
    M msautotest/renderers/expected/average_rgb.cairo.png
    M msautotest/renderers/expected/average_rgb.pdf
    M msautotest/renderers/expected/average_rgb.png
    M msautotest/renderers/expected/average_rgb.svg
    M msautotest/renderers/expected/rgb_overlay_res.cairo.png
    M msautotest/renderers/expected/rgb_overlay_res.pdf
    M msautotest/renderers/expected/rgb_overlay_res.png
    M msautotest/renderers/expected/rgb_overlay_res.svg
    M msautotest/renderers/expected/rgb_overlay_res_to8bit.cairo.png
    M msautotest/renderers/expected/rgb_overlay_res_to8bit.pdf
    M msautotest/renderers/expected/rgb_overlay_res_to8bit.png
    M msautotest/renderers/expected/rgb_overlay_res_to8bit.svg
    M msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.cairo.png
    M msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.pdf
    M msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.png
    M msautotest/renderers/expected/rgb_overlay_res_to8bit_dithered.svg
    M msautotest/renderers/expected/rgba_overlay_res.cairo.png
    M msautotest/renderers/expected/rgba_overlay_res.pdf
    M msautotest/renderers/expected/rgba_overlay_res.png
    M msautotest/renderers/expected/rgba_overlay_res.svg
    M msautotest/renderers/expected/uvraster.cairo.png
    M msautotest/renderers/expected/uvraster.pdf
    M msautotest/renderers/expected/uvraster.png
    M msautotest/renderers/expected/uvraster.svg
    M msautotest/renderers/expected/uvraster_reproj.cairo.png
    M msautotest/renderers/expected/uvraster_reproj.pdf
    M msautotest/renderers/expected/uvraster_reproj.png
    M msautotest/renderers/expected/uvraster_reproj.svg
    M msautotest/valgrind-suppressions.txt
    A msautotest/wxs/data/polar_stereo.tif
    M msautotest/wxs/expected/wcs11_post_getcov_gdpng8.dat
    M msautotest/wxs/expected/wcs11_post_getcov_grd_4326.dat
    M msautotest/wxs/expected/wcs11_post_getcov_grd_wgs84.dat
    M msautotest/wxs/expected/wcs_getcov_grd_11_4326.dat
    M msautotest/wxs/expected/wcs_getcov_grd_11_wgs84.dat
    M msautotest/wxs/expected/wcs_getcov_png8_11.dat
    A msautotest/wxs/expected/wms_polar_stereo.png
    A msautotest/wxs/wms_polar_stereo.map

  Log Message:
  -----------
  Merge branch 'branch-7-0'


Compare: https://github.com/mapserver/mapserver/compare/84b095769361...df06a0a2146d

More information about the mapserver-commits mailing list