[gdal] 01/08: Add upstream patch to avoid potential issue with CPL circular buffers.
Bas Couwenberg
sebastic at debian.org
Tue Jan 30 09:24:38 UTC 2018
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository gdal.
commit 297f3e5e2d91b11a67277a69abe45a34f730ca35
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Jan 29 22:26:48 2018 +0100
Add upstream patch to avoid potential issue with CPL circular buffers.
---
debian/changelog | 1 +
debian/patches/series | 1 +
...potential-issue-with-CPL-circular-buffers.patch | 28 ++++++++++++++++++++++
3 files changed, 30 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8ebd1ea..2a51e05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ gdal (2.2.3+dfsg-2) UNRELEASED; urgency=medium
* Reorder build dependencies (sorted by name).
* Remove jquery symlinks and dependencies.
* Update copyright-format URL to use HTTPS.
+ * Add upstream patch to avoid potential issue with CPL circular buffers.
-- Francesco Paolo Lovergine <frankie at debian.org> Tue, 02 Jan 2018 12:27:12 +0100
diff --git a/debian/patches/series b/debian/patches/series
index 1f79afe..9bfca75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ perl-vendor
privacy-breach-logo.patch
privacy-breach-generic.patch
perl-doxyfile
+svn-r41303_gnm-avoid-potential-issue-with-CPL-circular-buffers.patch
diff --git a/debian/patches/svn-r41303_gnm-avoid-potential-issue-with-CPL-circular-buffers.patch b/debian/patches/svn-r41303_gnm-avoid-potential-issue-with-CPL-circular-buffers.patch
new file mode 100644
index 0000000..fe228d2
--- /dev/null
+++ b/debian/patches/svn-r41303_gnm-avoid-potential-issue-with-CPL-circular-buffers.patch
@@ -0,0 +1,28 @@
+Description: GNM: avoid potential issue with CPL circular buffers (can happen if there are extra drivers that use CPLGet....() functions)
+Author: Even Rouault <even dot rouault at spatialys dot com>
+Origin: https://trac.osgeo.org/gdal/changeset/41303/
+
+--- a/gnm/gnm_frmts/file/gnmfilenetwork.cpp
++++ b/gnm/gnm_frmts/file/gnmfilenetwork.cpp
+@@ -101,10 +101,10 @@ CPLErr GNMFileNetwork::Open(GDALOpenInfo
+ }
+
+ m_poLayerDriver = m_pMetadataDS->GetDriver();
+- const char* pszExt = CPLGetExtension(soMetadatafile);
++ CPLString osExt = CPLGetExtension(soMetadatafile);
+
+ CPLString soGraphfile = CPLFormFilename(m_soNetworkFullName,
+- GNM_SYSLAYER_GRAPH, pszExt);
++ GNM_SYSLAYER_GRAPH, osExt);
+ m_pGraphDS = (GDALDataset*) GDALOpenEx( soGraphfile, GDAL_OF_VECTOR |
+ GDAL_OF_UPDATE, NULL, NULL, NULL );
+ if( NULL == m_pGraphDS )
+@@ -120,7 +120,7 @@ CPLErr GNMFileNetwork::Open(GDALOpenInfo
+ }
+
+ CPLString soFeaturesfile = CPLFormFilename(m_soNetworkFullName,
+- GNM_SYSLAYER_FEATURES, pszExt);
++ GNM_SYSLAYER_FEATURES, osExt);
+ m_pFeaturesDS = (GDALDataset*) GDALOpenEx( soFeaturesfile, GDAL_OF_VECTOR |
+ GDAL_OF_UPDATE, NULL, NULL, NULL );
+ if( NULL == m_pFeaturesDS )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git
More information about the Pkg-grass-devel
mailing list