This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch ubuntu/trusty in repository gdal.
commit c3b0095cdfb1661c18624e0be62f133dbc62b62f Author: Bas Couwenberg <[email protected]> Date: Wed Nov 9 18:36:27 2016 +0100 Add upstream patch to fix crash on URLs that are not DODS servers. --- debian/changelog | 2 ++ debian/patches/series | 1 + ...ix-crash-on-URL-that-are-not-DODS-servers.patch | 30 ++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6e97830..1c886ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ gdal (2.1.0+dfsg-1~trusty2) UNRELEASED; urgency=medium * Update branch in gbp.conf & Vcs-Git URL. + * Add upstream patch to fix crash on URLs that are not DODS servers. + (LP: #1640360) -- Bas Couwenberg <[email protected]> Wed, 09 Nov 2016 20:12:00 +0100 diff --git a/debian/patches/series b/debian/patches/series index 4a9b77a..9b29c06 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ spatialite java.opt perl-vendor privacy-breach-logo.patch +svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch diff --git a/debian/patches/svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch b/debian/patches/svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch new file mode 100644 index 0000000..e3b1ce1 --- /dev/null +++ b/debian/patches/svn-r36175-DODS-fix-crash-on-URL-that-are-not-DODS-servers.patch @@ -0,0 +1,30 @@ +Description: DODS: fix crash on URL that are not DODS servers +Author: Even Rouault <even dot rouault at spatialys dot com> +Origin: https://trac.osgeo.org/gdal/changeset/36175 +Bug: https://trac.osgeo.org/gdal/ticket/6718 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdal/+bug/1640360 + +--- a/frmts/dods/dodsdataset2.cpp ++++ b/frmts/dods/dodsdataset2.cpp +@@ -496,6 +496,8 @@ char **DODSDataset::CollectBandsFromDDSV + /* -------------------------------------------------------------------- */ + BaseType *poVar = get_variable( GetDDS(), oVarName ); + ++ if( poVar == NULL ) ++ return papszResultList; + if( poVar->type() == dods_array_c ) + { + poGrid = NULL; +@@ -1024,7 +1026,11 @@ DODSDataset::Open(GDALOpenInfo *poOpenIn + /* Did we get any target variables? */ + /* -------------------------------------------------------------------- */ + if( CSLCount(papszVarConstraintList) == 0 ) +- throw Error( "No apparent raster grids or arrays found in DDS."); ++ { ++ CPLDebug( "DODS", "No apparent raster grids or arrays found in DDS."); ++ delete poDS; ++ return NULL; ++ } + + /* -------------------------------------------------------------------- */ + /* For now we support only a single band. */ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
