final fix for no dbname bug

OSGeo · Mar 22, 2016 · 417f4ed · 417f4ed
1 parent e1482ca
commit 417f4ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/gdal/frmts/postgisraster/postgisrasterdataset.cpp b/gdal/frmts/postgisraster/postgisrasterdataset.cpp
@@ -2534,8 +2534,7 @@ GetConnectionInfo(const char * pszFilename,
     }
     else{
         *ppszDbname = 
-            CPLStrdup(CPLParseNameValue(papszParams[nPos], NULL));
-
+            CPLStrdup(CPLParseNameValue(papszParams[nPos], NULL));    
     }
 
     /**

diff --git a/gdal/frmts/postgisraster/postgisrasterdriver.cpp b/gdal/frmts/postgisraster/postgisrasterdriver.cpp
@@ -75,6 +75,7 @@ PGconn* PostGISRasterDriver::GetConnection(const char* pszConnectionString,
     if( pszHostIn == NULL ) pszHostIn = "(null)";
     if( pszPortIn == NULL ) pszPortIn = "(null)";
     if( pszUserIn == NULL ) pszUserIn = "(null)";
+    if( pszDbnameIn == NULL) pszDbnameIn = "(null)";
     CPLString osKey = pszDbnameIn;
     osKey += "-";
     osKey += pszHostIn;