adjust as suggested

PDAL · Mar 1, 2020 · 8790296 · 8790296
1 parent c4a673b
commit 8790296
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/pdal/SpatialReference.cpp b/pdal/SpatialReference.cpp
@@ -444,18 +444,27 @@ std::string SpatialReference::convertToWKT1(const std::string& wkt)
 
 // WKT flavors only exist in GDAL 3.x+
 #if GDAL_VERSION_MAJOR >= 3
+
     OGRScopedSpatialReference srs = ogrCreateSrs(wkt);
     if (!srs)
         return outWkt;
 
     char *buf = nullptr;
 
-    char **papszOptions = nullptr;
-    papszOptions = CSLAddNameValue(papszOptions, "FORMAT", "WKT1_GDAL");
-    srs->exportToWkt(&buf, papszOptions);
+    const char* apszOptions[] = { "FORMAT=WKT1_GDAL", nullptr };
+    srs->exportToWkt(&buf, apszOptions);
+
+    // If we couldn't convert to WKT1, return empty
+    if (buf == nullptr)
+    {
+        outWkt = "";
+    }
+    else
+    {
+        outWkt = buf;
+        CPLFree(buf);
+    }
 
-    outWkt = buf;
-    CPLFree(buf);
 #endif
     return outWkt;
 }