Changeset 1585:5ffcd83c54fd

Timestamp:

02/20/10 11:20:39 (5 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Message:

apply Even's patch for #154

File:

• src/lasspatialreference.cpp (modified) (9 diffs)

src/lasspatialreference.cpp

@@ -392 +392 @@
             && strstr(pszWKT,"COMPD_CS") != NULL )
         {
-            OGRSpatialReference* poSRS = new OGRSpatialReference();
+            OGRSpatialReference* poSRS = (OGRSpatialReference*) OSRNewSpatialReference(NULL);
             char *pszOrigWKT = pszWKT;
             poSRS->importFromWkt( &pszOrigWKT );
@@ -401 +401 @@
             poSRS->StripVertical();
             poSRS->exportToWkt( &pszWKT );
+            
+            OGRSpatialReference::DestroySpatialReference(poSRS);
         }
 #endif
@@ -407 +409 @@
         {
             std::string tmp(pszWKT);
-            std::free(pszWKT);
+            CPLFree(pszWKT);
             return tmp;
         }
@@ -421 +423 @@
     char* poWKT = 0;
     const char* input = v.c_str();
-    OGRSpatialReference* poSRS = new OGRSpatialReference();
+    OGRSpatialReference* poSRS = (OGRSpatialReference*) OSRNewSpatialReference(NULL);
     if (OGRERR_NONE != poSRS->SetFromUserInput((char *) input))
     {
-        delete poSRS;
+        OGRSpatialReference::DestroySpatialReference(poSRS);
         throw std::invalid_argument("could not import coordinate system into OSRSpatialReference SetFromUserInput");
     }
     
     poSRS->exportToWkt(&poWKT);
-    delete poSRS;
+    OGRSpatialReference::DestroySpatialReference(poSRS);
     
     std::string tmp(poWKT);
-    std::free(poWKT);
+    CPLFree(poWKT);
     
     SetWKT(tmp);
@@ -516 +518 @@
     const char* poWKT = wkt.c_str();
     
-    OGRSpatialReference* poSRS = new OGRSpatialReference();
+    OGRSpatialReference* poSRS = (OGRSpatialReference*) OSRNewSpatialReference(NULL);
     if (OGRERR_NONE != poSRS->importFromWkt((char **) &poWKT))
     {
-        delete poSRS;
+        OGRSpatialReference::DestroySpatialReference(poSRS);
         return std::string();
     }
@@ -526 +528 @@
     poSRS->exportToProj4(&proj4);
     std::string tmp(proj4);
-    std::free(proj4);
-    
-    delete poSRS;
+    CPLFree(proj4);
+    
+    OGRSpatialReference::DestroySpatialReference(poSRS);
 
     return tmp;
@@ -543 +545 @@
         char* proj4def = GTIFGetProj4Defn(&defn);
         std::string tmp(proj4def);
-        std::free(proj4def);
+        std::free(proj4def); /* risk of cross-heap issue, but no free function in libgeotiff matching GTIFGetProj4Defn */
 
         return tmp;
@@ -565 +567 @@
     char* poWKT = 0;
     const char* poProj4 = v.c_str();
-    OGRSpatialReference* poSRS = new OGRSpatialReference();
+    OGRSpatialReference* poSRS = (OGRSpatialReference*) OSRNewSpatialReference(NULL);
     if (OGRERR_NONE != poSRS->importFromProj4((char *) poProj4))
     {
-        delete poSRS;
+        OGRSpatialReference::DestroySpatialReference(poSRS);
         throw std::invalid_argument("could not import proj4 into OSRSpatialReference SetProj4");
     }
     
     poSRS->exportToWkt(&poWKT);
-    delete poSRS;
+    OGRSpatialReference::DestroySpatialReference(poSRS);
     
     std::string tmp(poWKT);
-    std::free(poWKT);
+    CPLFree(poWKT);
         
     int ret = 0;
@@ -597 +599 @@
         char* proj4def = GTIFGetProj4Defn(&defn);
         std::string tmp(proj4def);
-        std::free(proj4def);
+        std::free(proj4def); /* risk of cross-heap issue, but no free function in libgeotiff matching GTIFGetProj4Defn */
     }
 #else