found 7zip in C:\Program Files\7-Zip\7z.exe
set PATH=E:\buildsystem\release-1916-x64\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\;C:\Program Files\Microsoft\jdk-11.0.12.7-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\nodejs\;C:\ProgramData\chocolatey\bin;C:\Program Files\7-Zip;C:\Users\szeke\AppData\Local\Microsoft\WindowsApps;C:\Users\szeke\.dotnet\tools;C:\Program Files\Azure Data Studio\bin;C:\Users\szeke\AppData\Roaming\npm;E:\MSVSCode\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
if not exist src\mapserver-vc15x64 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc15x64
cd src\mapserver-vc15x64
git reset --hard HEAD
HEAD is now at 2fcc5b6c6 Revert "Allow configObj to be set in msLoadMapFromString"
git fetch
git checkout main
Your branch is behind 'origin/main' by 56 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
git pull origin main
Updating 2fcc5b6c6..4f9905559
Fast-forward
.github/workflows/cifuzz.yml | 24 ++
CMakeLists.txt | 29 +-
fuzzers/CMakeLists.txt | 16 +-
fuzzers/README.md | 64 ++++
fuzzers/build.sh | 91 +++++
fuzzers/mapfuzzer.c | 56 +++
fuzzers/reproducer_main.cpp | 118 ++++++
fuzzers/shapefuzzer.c | 51 ++-
maperror.c | 6 +-
maperror.h | 1 +
mapfile.c | 73 +++-
maplabel.c | 9 +-
maplexer.c | 789 ++++++++++++++++++++--------------------
maplexer.l | 81 ++---
mapproject.c | 1 +
mapscript/python/pyextend.i | 11 +-
mapscript/swiginc/map.i | 8 +-
mapserv-config.cpp | 4 +-
mapserver.h | 2 +-
mapshape.c | 153 +++++---
msautotest/php/shapeObjTest.php | 2 +-
21 files changed, 1053 insertions(+), 536 deletions(-)
create mode 100644 .github/workflows/cifuzz.yml
create mode 100644 fuzzers/README.md
create mode 100755 fuzzers/build.sh
create mode 100644 fuzzers/mapfuzzer.c
create mode 100644 fuzzers/reproducer_main.cpp
git reset --hard HEAD
HEAD is now at 4f9905559 Merge pull request #6684 from rouault/fix_ossfuzz_52175
git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\ms_revision.txt
type E:\buildsystem\release-1916-x64\doc\ms_revision.txt
4f9905559c8f97818bbf9323da83a791bb10e6f7 cd E:\buildsystem
if not exist src\gdal-vc15x64 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc15x64
cd src\gdal-vc15x64
git reset --hard HEAD
HEAD is now at dc0012850f Merge pull request #6423 from rouault/vrt_flushcache_lint
git fetch
git checkout master
Your branch is behind 'origin/master' by 147 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
git pull origin master
Updating dc0012850f..0ee692724c
Fast-forward
.github/workflows/cifuzz.yml | 29 +
.github/workflows/cmake_builds.yml | 5 +-
.github/workflows/code_checks.yml | 2 +-
.github/workflows/macos.yml | 1 +
.gitignore | 3 -
MIGRATION_GUIDE.TXT | 11 +
alg/gdalchecksum.cpp | 61 +-
alg/gdalwarpkernel.cpp | 89 +-
apps/gdal_translate_lib.cpp | 6 +-
apps/gdalbuildvrt_lib.cpp | 19 +-
autotest/cpp/test_cpl.cpp | 133 +-
autotest/gcore/tiff_ovr.py | 90 +-
autotest/gcore/tiff_read.py | 304 +++
autotest/gcore/tiff_write.py | 260 ++-
autotest/gcore/vrtmisc.py | 39 +
autotest/gcore/vsiaz.py | 2 +-
.../{vsicredential.py => vsipathspecificoption.py} | 46 +-
autotest/gcore/vsis3.py | 72 +
autotest/gdrivers/ecrgtoc.py | 16 +
autotest/gdrivers/ecw.py | 9 +-
autotest/gdrivers/envi.py | 107 +-
autotest/gdrivers/gdalhttp.py | 7 +-
autotest/gdrivers/gff.py | 2 +-
autotest/gdrivers/gpkg.py | 152 +-
autotest/gdrivers/jp2openjpeg.py | 41 +-
autotest/gdrivers/jpegxl.py | 130 +-
autotest/gdrivers/nitf.py | 13 +-
autotest/gdrivers/webp.py | 8 +
autotest/ogr/ogr_openfilegdb_write.py | 693 +++++++
autotest/pymod/gdaltest.py | 11 -
autotest/utilities/test_gdalwarp_lib.py | 29 +
cmake/helpers/CheckDependentLibraries.cmake | 3 -
cmake/helpers/GdalSwigBindings.cmake | 2 +-
cmake/helpers/configure.cmake | 14 +
doc/Makefile | 2 +-
doc/environment.yml | 1 -
doc/requirements.txt | 1 -
doc/source/api/python/osgeo.gdal.rst | 7 +
doc/source/api/python/osgeo.gdal_array.rst | 7 +
doc/source/api/python/osgeo.gdalconst.rst | 7 +
doc/source/api/python/osgeo.gnm.rst | 7 +
doc/source/api/python/osgeo.ogr.rst | 7 +
doc/source/api/python/osgeo.osr.rst | 7 +
doc/source/api/python/osgeo.rst | 23 +
doc/source/build_configoptions_index.py | 74 +-
doc/source/conf.py | 16 -
doc/source/drivers/raster/gpkg.rst | 22 +-
doc/source/drivers/raster/gtiff.rst | 16 +-
doc/source/drivers/raster/zarr.rst | 2 +-
doc/source/drivers/vector/openfilegdb.rst | 2 +-
doc/source/programs/gdal_grid.rst | 14 +-
doc/source/programs/gdal_translate.rst | 5 +
doc/source/programs/gdaladdo.rst | 3 +
doc/source/user/configoptions.rst | 2 +-
doc/source/user/virtual_file_systems.rst | 6 +-
frmts/dimap/dimapdataset.cpp | 4 +-
frmts/ecw/ecwdataset.cpp | 45 +-
frmts/exr/exrdataset.cpp | 11 +-
frmts/georaster/georaster_dataset.cpp | 12 +-
frmts/georaster/georaster_priv.h | 7 +-
frmts/gtiff/cogdriver.cpp | 11 +-
frmts/gtiff/geotiff.cpp | 2012 +++++++++++++++++---
frmts/gtiff/gt_overview.cpp | 200 +-
frmts/gtiff/gt_overview.h | 2 +-
frmts/gtiff/gtiff.h | 8 +
frmts/gtiff/libtiff/tif_close.c | 6 +-
frmts/gtiff/libtiff/tif_dir.c | 129 +-
frmts/gtiff/libtiff/tif_dir.h | 2 +
frmts/gtiff/libtiff/tif_dirread.c | 147 +-
frmts/gtiff/libtiff/tif_open.c | 3 +-
frmts/gtiff/libtiff/tiffiop.h | 3 +-
frmts/gtiff/tif_jxl.c | 119 +-
frmts/hfa/hfa_overviews.cpp | 20 +-
frmts/hfa/hfadataset.cpp | 33 +-
frmts/hfa/hfadataset.h | 12 +-
frmts/jp2kak/jp2kakdataset.cpp | 10 +-
frmts/jp2kak/jp2kakdataset.h | 9 +-
frmts/jpeg/jpgdataset.cpp | 14 +-
frmts/jpeg/jpgdataset.h | 7 +-
frmts/jpegxl/jpegxl.cpp | 82 +-
frmts/kea/keaband.cpp | 2 +-
frmts/kea/keaband.h | 2 +-
frmts/kea/keadataset.cpp | 13 +-
frmts/kea/keadataset.h | 9 +-
frmts/mbtiles/mbtilesdataset.cpp | 17 +-
frmts/mem/memdataset.cpp | 22 +-
frmts/mem/memdataset.h | 7 +-
frmts/mrf/marfa.h | 7 +-
frmts/mrf/marfa_dataset.cpp | 13 +-
frmts/mrsid/mrsiddataset.cpp | 15 +-
frmts/netcdf/netcdfdataset.cpp | 23 +-
frmts/nitf/ecrgtocdataset.cpp | 170 +-
frmts/nitf/nitfdataset.cpp | 52 +-
frmts/nitf/nitfdataset.h | 13 +-
frmts/nitf/nitfrasterband.cpp | 6 +-
frmts/o/README.TXT | 7 -
frmts/openjpeg/openjpegdataset.cpp | 43 +-
frmts/pcidsk/pcidskdataset2.cpp | 22 +-
frmts/pcidsk/pcidskdataset2.h | 7 +-
frmts/pcidsk/sdk/core/cpcidskfile.cpp | 2 +-
frmts/pcidsk/sdk/core/cpcidskfile.h | 2 +-
frmts/pcidsk/sdk/pcidsk_file.h | 2 +-
frmts/pdf/gdal_pdf.h | 7 +-
frmts/pdf/pdfdataset.cpp | 12 +-
frmts/pds/pdsdataset.cpp | 20 +-
frmts/rasterlite/rasterlitecreatecopy.cpp | 4 +-
frmts/rasterlite/rasterlitedataset.h | 11 +-
frmts/rasterlite/rasterliteoverviews.cpp | 20 +-
frmts/raw/envidataset.cpp | 112 +-
frmts/raw/envidataset.h | 2 +
frmts/rmf/rmfdataset.cpp | 15 +-
frmts/rmf/rmfdataset.h | 7 +-
frmts/sigdem/sigdemdataset.cpp | 19 +-
frmts/stacta/stactadataset.cpp | 16 +-
frmts/stacta/stactadataset.h | 2 +-
frmts/vrt/vrtdataset.cpp | 10 +-
frmts/vrt/vrtdataset.h | 67 +-
frmts/vrt/vrtsourcedrasterband.cpp | 22 +-
frmts/vrt/vrtsources.cpp | 144 +-
frmts/vrt/vrtwarped.cpp | 15 +-
frmts/webp/webpdataset.cpp | 19 +-
frmts/wms/wmsdriver.cpp | 20 +-
fuzzers/build.sh | 111 +-
gcore/gdal.h | 67 +-
gcore/gdal_pam.h | 7 +-
gcore/gdal_priv.h | 67 +-
gcore/gdal_proxy.h | 11 +-
gcore/gdaldataset.cpp | 322 +++-
gcore/gdaldefaultoverviews.cpp | 77 +-
gcore/gdaljp2abstractdataset.cpp | 39 +
gcore/gdaljp2abstractdataset.h | 5 +
gcore/gdaljp2box.cpp | 4 +-
gcore/gdaljp2metadata.h | 10 +
gcore/gdaljp2structure.cpp | 1226 +++++++-----
gcore/gdalopeninfo.cpp | 4 +-
gcore/gdalpamdataset.cpp | 16 +-
gcore/gdalpamrasterband.cpp | 4 +-
gcore/gdalproxydataset.cpp | 15 +-
gcore/gdalrasterband.cpp | 9 +-
gcore/overview.cpp | 78 +-
gcore/rasterio.cpp | 2 +-
gdal.cmake | 3 +-
gnm/gnm_frmts/o/README.TXT | 7 -
ogr/ogr_fromepsg.cpp | 2 +
ogr/ogr_proj_p.cpp | 48 +-
ogr/ogr_proj_p.h | 20 +-
ogr/ogr_spatialref.h | 3 +
ogr/ogrct.cpp | 15 +-
ogr/ogrgeometry.cpp | 2 +-
ogr/ogrsf_frmts/cad/libopencad/cadgeometry.h | 7 +
ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp | 7 +-
ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp | 10 +-
ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp | 13 +-
ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp | 11 +-
ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h | 2 +
ogr/ogrsf_frmts/gpkg/ogr_geopackage.h | 10 +-
ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 177 +-
ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp | 8 +-
ogr/ogrsf_frmts/o/README.TXT | 7 -
ogr/ogrsf_frmts/ods/ogrodsdriver.cpp | 33 +-
ogr/ogrsf_frmts/openfilegdb/filegdb_relationship.h | 319 +++-
ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp | 49 +-
ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h | 17 +
.../openfilegdb/ogropenfilegdbdatasource_write.cpp | 486 +++++
.../openfilegdb/ogropenfilegdbdriver.cpp | 5 +
.../openfilegdb/ogropenfilegdblayer.cpp | 15 +-
ogr/ogrsf_frmts/shape/ogrshapelayer.cpp | 75 +-
ogr/ogrsf_frmts/sqlite/ogr_sqlite.h | 7 +-
ogr/ogrsf_frmts/sqlite/rasterlite2.cpp | 9 +-
ogr/ogrspatialreference.cpp | 121 ++
port/CMakeLists.txt | 5 +
port/cpl_alibaba_oss.cpp | 10 +-
port/cpl_aws.cpp | 46 +-
port/cpl_azure.cpp | 18 +-
port/cpl_conv.cpp | 4 +-
port/cpl_google_cloud.cpp | 32 +-
port/cpl_mem_cache.h | 35 +
port/cpl_noncopyablevector.h | 58 +
port/cpl_odbc.cpp | 23 +-
port/cpl_swift.cpp | 60 +-
port/cpl_vsi.h | 24 +-
port/cpl_vsi_mem.cpp | 19 +
port/cpl_vsi_virtual.h | 5 +
port/cpl_vsil.cpp | 132 +-
port/cpl_vsil_cache.cpp | 325 ++--
port/cpl_vsil_curl.cpp | 239 ++-
port/cpl_vsil_curl_class.h | 19 +-
port/cpl_vsil_s3.cpp | 2 +-
port/cpl_vsil_unix_stdio_64.cpp | 31 +
port/cpl_vsil_webhdfs.cpp | 26 +-
swig/include/Dataset.i | 32 +-
swig/include/cpl.i | 25 +-
swig/include/csharp/gdal_csharp.i | 9 +-
swig/include/gdalconst.i | 20 +
swig/python/CMakeLists.txt | 84 +-
swig/python/extensions/gdal_wrap.cpp | 428 ++++-
swig/python/extensions/gdalconst_wrap.c | 7 +
swig/python/osgeo/gdal.py | 26 +-
swig/python/osgeo/gdalconst.py | 7 +
third_party/o/README.TXT | 5 -
200 files changed, 9335 insertions(+), 2531 deletions(-)
create mode 100644 .github/workflows/cifuzz.yml
rename autotest/gcore/{vsicredential.py => vsipathspecificoption.py} (55%)
create mode 100644 doc/source/api/python/osgeo.gdal.rst
create mode 100644 doc/source/api/python/osgeo.gdal_array.rst
create mode 100644 doc/source/api/python/osgeo.gdalconst.rst
create mode 100644 doc/source/api/python/osgeo.gnm.rst
create mode 100644 doc/source/api/python/osgeo.ogr.rst
create mode 100644 doc/source/api/python/osgeo.osr.rst
create mode 100644 doc/source/api/python/osgeo.rst
delete mode 100644 frmts/o/README.TXT
delete mode 100644 gnm/gnm_frmts/o/README.TXT
delete mode 100644 ogr/ogrsf_frmts/o/README.TXT
create mode 100644 port/cpl_noncopyablevector.h
delete mode 100644 third_party/o/README.TXT
git reset --hard HEAD
HEAD is now at 0ee692724c Merge pull request #6489 from rouault/doc_config_options_from_doxygen
git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\gdal_revision.txt
type E:\buildsystem\release-1916-x64\doc\gdal_revision.txt
0ee692724c5717a633e9f14314c06b9811ac1618 cd E:\buildsystem
set PATH=E:\buildsystem\release-1916-x64\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\;C:\Program Files\Microsoft\jdk-11.0.12.7-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\nodejs\;C:\ProgramData\chocolatey\bin;C:\Program Files\7-Zip;C:\Users\szeke\AppData\Local\Microsoft\WindowsApps;C:\Users\szeke\.dotnet\tools;C:\Program Files\Azure Data Studio\bin;C:\Users\szeke\AppData\Roaming\npm;E:\MSVSCode\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja
if not exist src\mapcache-vc15x64 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc15x64
cd src\mapcache-vc15x64
git reset --hard HEAD
HEAD is now at 593314a Fix check failure caused by wrong HTTP header removal on Windows (#285)
git fetch
git checkout main
Your branch is behind 'origin/main' by 1 commit, and can be fast-forwarded.
(use "git pull" to update your local branch)
git pull origin main
Updating 593314a..882c009
Fast-forward
lib/cache_disk.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\mapcache_revision.txt
type E:\buildsystem\release-1916-x64\doc\mapcache_revision.txt
882c009d6e059286753007bdcc9e7cd4af66dbd6 cd E:\buildsystem