fixed segfault on exit if path does not exist

OSGeo · Apr 11, 2019 · b7b8d3b · b7b8d3b
1 parent b1f01a4
commit b7b8d3b
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/gdal/frmts/tiledb/tiledbdataset.cpp b/gdal/frmts/tiledb/tiledbdataset.cpp
@@ -436,8 +436,8 @@ TileDBDataset::~TileDBDataset()
             static_cast<TileDBRasterBand*>( poBand )->Finalize();
         }
     }
-
-    m_array->close();
+    if ( m_array )
+        m_array->close();
     CPLDestroyXMLNode( psSubDatasetsTree );
     CSLDestroy( papszSubDatasets );
 }
@@ -601,7 +601,7 @@ CPLErr TileDBDataset::TrySaveXML()
     }
     catch(const tiledb::TileDBError e)
     {
-        CPLError( CE_Failure, CPLE_AppDefined, "TileDB: %s\n", e.what() );
+        CPLError( CE_Failure, CPLE_AppDefined, "%s\n", e.what() );
         return CE_Failure;
     }
 }
@@ -716,7 +716,7 @@ CPLErr TileDBDataset::TryLoadXML( char ** /*papszSiblingFiles*/ )
     }
     catch(const tiledb::TileDBError e)
     {
-        CPLError( CE_Failure, CPLE_AppDefined, "TileDB: %s\n", e.what() );
+        CPLError( CE_Failure, CPLE_AppDefined, "%s\n", e.what() );
         return CE_Failure;
     }
 }
@@ -803,7 +803,7 @@ CPLErr TileDBDataset::AddFilter( const char* pszFilterName, const int level )
     }
     catch(const tiledb::TileDBError e)
     {
-        CPLError( CE_Failure, CPLE_AppDefined, "TileDB: %s\n", e.what() );
+        CPLError( CE_Failure, CPLE_AppDefined, "%s\n", e.what() );
         return CE_Failure;
     }
 }
@@ -829,7 +829,7 @@ CPLErr TileDBDataset::Delete( const char * pszFilename )
     }
     catch(const tiledb::TileDBError e)
     {
-        CPLError( CE_Failure, CPLE_AppDefined, "TileDB: %s\n", e.what() );
+        CPLError( CE_Failure, CPLE_AppDefined, "%s\n", e.what() );
         return CE_Failure;
     }
 }
@@ -1096,7 +1096,7 @@ GDALDataset *TileDBDataset::Open( GDALOpenInfo * poOpenInfo )
     }
     catch(const tiledb::TileDBError e)
     {
-        CPLError( CE_Failure, CPLE_AppDefined, "TileDB: %s\n", e.what() );
+        CPLError( CE_Failure, CPLE_AppDefined, "%s\n", e.what() );
         return nullptr;
     }
 }
@@ -1288,7 +1288,7 @@ CPLErr TileDBDataset::CreateAttribute( GDALDataType eType,
     }
     catch(const tiledb::TileDBError e)
     {
-        CPLError( CE_Failure, CPLE_AppDefined, "TileDB: %s\n", e.what() );
+        CPLError( CE_Failure, CPLE_AppDefined, "%s\n", e.what() );
         return CE_Failure;
     }
 }
@@ -1425,7 +1425,7 @@ TileDBDataset* TileDBDataset::CreateLL( const char *pszFilename,
     }
     catch(const tiledb::TileDBError e)
     {
-        CPLError( CE_Failure, CPLE_AppDefined, "TileDB: %s\n", e.what() );
+        CPLError( CE_Failure, CPLE_AppDefined, "%s\n", e.what() );
         return nullptr;
     }
 }
@@ -1624,7 +1624,7 @@ CPLErr TileDBDataset::CopySubDatasets( GDALDataset* poSrcDS,
     }
     catch(const tiledb::TileDBError e)
     {
-        CPLError( CE_Failure, CPLE_AppDefined, "TileDB: %s\n", e.what() );
+        CPLError( CE_Failure, CPLE_AppDefined, "%s\n", e.what() );
         return CE_Failure;
     }
 }
@@ -1672,7 +1672,7 @@ TileDBDataset::Create( const char * pszFilename, int nXSize, int nYSize, int nBa
     }
     catch(const tiledb::TileDBError e)
     {
-        CPLError( CE_Failure, CPLE_AppDefined, "TileDB: %s\n", e.what() );
+        CPLError( CE_Failure, CPLE_AppDefined, "%s\n", e.what() );
         return nullptr;
     }
 }
@@ -1822,7 +1822,7 @@ TileDBDataset::CreateCopy( const char * pszFilename, GDALDataset *poSrcDS,
     }
     catch(const tiledb::TileDBError e)
     {
-        CPLError( CE_Failure, CPLE_AppDefined, "TileDB: %s\n", e.what() );
+        CPLError( CE_Failure, CPLE_AppDefined, "%s\n", e.what() );
         return nullptr;
     }
 }