Changeset 13906

Timestamp:

03/01/08 08:08:28 (4 months ago)

Author:

rouault

Message:

Fix memory usage and leaks in OGRILI2 (bug #2203)

Files:

• trunk/gdal/ogr/ogrsf_frmts/ili/ili2reader.cpp (modified) (20 diffs)
• trunk/gdal/ogr/ogrsf_frmts/ili/ili2reader.h (modified) (1 diff)
• trunk/gdal/ogr/ogrsf_frmts/ili/ogr_ili2.h (modified) (4 diffs)
• trunk/gdal/ogr/ogrsf_frmts/ili/ogrili2datasource.cpp (modified) (12 diffs)
• trunk/gdal/ogr/ogrsf_frmts/ili/ogrili2driver.cpp (modified) (1 diff)
• trunk/gdal/ogr/ogrsf_frmts/ili/ogrili2layer.cpp (modified) (4 diffs)

trunk/gdal/ogr/ogrsf_frmts/ili/ili2reader.cpp

@@ -102 +102 @@
-int getGeometryTypeOfElem(DOMElement* elem) {
-  int type = ILI2_STRING_TYPE;
+  char* pszTagName = XMLString::transcode(elem->getTagName());
-
-  if (elem && elem->getNodeType() == DOMNode::ELEMENT_NODE) {
-XMLString::transcode(elem->getTagName())
+pszTagName
-      type = ILI2_COORD_TYPE;
-XMLString::transcode(elem->getTagName())
+pszTagName
-      type = ILI2_ARC_TYPE;
-XMLString::transcode(elem->getTagName())
+pszTagName
-      type = ILI2_POLYLINE_TYPE;
-XMLString::transcode(elem->getTagName())
+pszTagName
-      type = ILI2_BOUNDARY_TYPE;
-XMLString::transcode(elem->getTagName())
+pszTagName
-      type = ILI2_AREA_TYPE;
-XMLString::transcode(elem->getTagName())
+pszTagName
-      type = ILI2_AREA_TYPE;
-    }
-  }
+  XMLString::release(&pszTagName);
-  return type;
-}
@@ -125 +127 @@
-
-  if ((textElem != NULL) && (textElem->getNodeType() == DOMNode::TEXT_NODE))
-
+
+
+
+
+
+
-
-  return NULL;
@@ -131 +138 @@
-
-char *getREFValue(DOMElement *elem) {
-
+
+
+
+
+
+
-}
-
@@ -140 +152 @@
-  DOMElement *coordElem = (DOMElement *)elem->getFirstChild();
-  while (coordElem != NULL) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    coordElem = (DOMElement *)coordElem->getNextSibling();
-  }
@@ -165 +181 @@
-  DOMElement *arcElem = (DOMElement *)elem->getFirstChild();
-  while (arcElem != NULL) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    arcElem = (DOMElement *)arcElem->getNextSibling();
-  }
@@ -194 +213 @@
-  DOMElement *lineElem = (DOMElement *)elem->getFirstChild();
-  while (lineElem != NULL) {
-
+
+
-      ls->addPoint(getPoint(lineElem));
-XMLString::transcode(lineElem->getTagName())
+pszTagName
-      // end point
-      OGRPoint *ptEnd = new OGRPoint();
@@ -206 +226 @@
-      DOMElement *arcElem = (DOMElement *)lineElem->getFirstChild();
-      while (arcElem != NULL) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        arcElem = (DOMElement *)arcElem->getNextSibling();
@@ -230 +254 @@
-    } /* else { // FIXME StructureValue in Polyline not yet supported
-    } */
+    XMLString::release(&pszTagName);
-
-    lineElem = (DOMElement *)lineElem->getNextSibling();
@@ -241 +266 @@
-  DOMElement *lineElem = (DOMElement *)elem->getFirstChild();
-  if (lineElem != NULL)
-
+
+
+
+
+
-      return getLineString(lineElem);
+    }
+    XMLString::release(&pszTagName);
+  }
-
-  return new OGRLineString;
@@ -252 +284 @@
-  DOMElement *boundaryElem = (DOMElement *)elem->getFirstChild(); // outer boundary
-  while (boundaryElem != NULL) {
-
+
+
-      pg->addRing((OGRLinearRing *)getBoundary(boundaryElem));
-
+
-    boundaryElem = (DOMElement *)boundaryElem->getNextSibling(); // inner boundaries
-  }
@@ -266 +299 @@
-  DOMElement *childElem = elem;
-  while (childElem != NULL) {
+    char* pszTagName = XMLString::transcode(childElem->getTagName());
-    switch (type) {
-      case ILI2_COORD_TYPE :
-
+
+
+
+
-          return getPoint(childElem);
+        }
-        break;
-      case ILI2_ARC_TYPE :
-        // is it possible here? It have to be a ARC or COORD before (getPreviousSibling)
-
+
+
+
+
-          return getArc(childElem);
+        }
-        break;
-      case ILI2_POLYLINE_TYPE :
-
+
+
+
+
-          return getLineString(childElem);
+        }
-        break;
-      case ILI2_BOUNDARY_TYPE :
-
+
+
+
+
-          return getLineString(childElem);
+        }
-        break;
-      case ILI2_AREA_TYPE :
-
-
+
+
+
+
+
-          return getPolygon(childElem);
+        }
-        break;
-      default :
-        if (type >= ILI2_GEOMCOLL_TYPE) {
-          int subType = getGeometryTypeOfElem(childElem); //????
-
+Directly
-        }
-        break;
-    }
+    XMLString::release(&pszTagName);
-
-    // GEOMCOLL
@@ -429 +484 @@
-  for (d=depth-1; d>=0; --d) {
-    if (d < depth-1) fullname += "_";
-
+
+
+
-  }
-  return CPLStrdup(fullname.c_str());
@@ -448 +505 @@
-        if (featureDef->GetFieldIndex(fName) == -1) {
-          CPLDebug( "OGR_ILI", "AddFieldDefn: %s",fName );
-*fieldDef = new OGR
-fieldDef
+o
+&oFieldDefn
-        }
-        CPLFree(fName);
@@ -475 +532 @@
-            objVal = getREFValue(childElem); // only to try
-          feature->SetField(fIndex, objVal);
+          CPLFree(objVal);
-        } else {
-          m_missAttrs.push_back(fName);
@@ -481 +539 @@
-      }
-    } else {
-
+Directly
-    }
-  }
@@ -507 +565 @@
-
-    CleanupParser();
+
+    list<OGRLayer *>::const_iterator layerIt = m_listLayer.begin();
+    while (layerIt != m_listLayer.end()) {
+        OGRILI2Layer *tmpLayer = (OGRILI2Layer *)*layerIt;
+        delete tmpLayer;
+        layerIt++;
+    }
-}
-
@@ -652 +717 @@
-    OGRwkbGeometryType eReqType = wkbUnknown;
-    OGRILI2DataSource *poDSIn = NULL;
-CPLStrdup(pszName)
+pszName
-    m_listLayer.push_back(curLayer);
-  }
@@ -660 +725 @@
-  if (newLayer) {
-    // the TID feature
-*fieldDef = new OGRFieldDefn(CPLStrdup(ILI2_TID)
-fieldDef
+ofieldDefn (ILI2_TID
+&ofieldDefn
-
-    setFieldDefn(featureDef, elem);
@@ -671 +736 @@
-  // the TID feature
-  int fIndex = feature->GetFieldIndex(ILI2_TID);
-
-
+
+
+
+
+
-
-  SetFieldValues(feature, elem);
-  curLayer->SetFeature(feature);
+  
+  XMLString::release (&pszName);
-
-  return 0;
@@ -683 +753 @@
-    return new ILI2Reader();
-}
+
+void DestroyILI2Reader(IILI2Reader* reader)
+{
+    if (reader)
+        delete reader;
+}

trunk/gdal/ogr/ogrsf_frmts/ili/ili2reader.h

@@ -55 +55 @@
-
-IILI2Reader *CreateILI2Reader();
+void DestroyILI2Reader(IILI2Reader* reader);
-
-#endif

trunk/gdal/ogr/ogrsf_frmts/ili/ogr_ili2.h

@@ -49 +49 @@
-    OGRSpatialReference *poSRS;
-    OGRFeatureDefn     *poFeatureDefn;
-    OGRGeometry        *poFilterGeom;
-    std::list<OGRFeature *>    listFeature;
-    std::list<OGRFeature *>::const_iterator listFeatureIt;
@@ -66 +65 @@
-                       ~OGRILI2Layer();
-
-    OGRGeometry *       GetSpatialFilter() { return poFilterGeom; }
-    void                SetSpatialFilter( OGRGeometry * );
-
-    OGRErr              SetFeature(OGRFeature *poFeature);
-    
@@ -75 +71 @@
-
-    int                 GetFeatureCount( int bForce = TRUE );
-    OGRErr              GetExtent(OGREnvelope *psExtent, int bForce = TRUE);
-
-    OGRErr              CreateFeature( OGRFeature *poFeature );
@@ -98 +93 @@
-    
-    char        *pszName;
-    const char  *pszModelFilename;
-    IILI2Reader *poReader;
-    IOM_FILE    fpTransfer;  //for writing
-    IOM_BASKET  basket;
+
+    int         nLayers;
+    OGRILI2Layer** papoLayers;
-
-  public:

trunk/gdal/ogr/ogrsf_frmts/ili/ogrili2datasource.cpp

@@ -51 +51 @@
-    fpTransfer = NULL;
-    basket = NULL;
+    nLayers = 0;
+    papoLayers = NULL;
-}
-
@@ -60 +62 @@
-
-{
+    int i;
+
+    for(i=0;i<nLayers;i++)
+    {
+        delete papoLayers[i];
+    }
+    CPLFree( papoLayers );
+
-    if (basket) iom_releasebasket(basket);
-    if (fpTransfer)
@@ -72 +82 @@
-  
-    }
+    DestroyILI2Reader( poReader );
-    CPLFree( pszName );
-}
@@ -92 +103 @@
-    if( CSLCount(filenames) > 1 )
-        modelFilenames = &filenames[1];
-
-    CSLDestroy( filenames );
-
-/* -------------------------------------------------------------------- */
@@ -106 +115 @@
-                      pszNewName );
-
+        CSLDestroy( filenames );
-        return FALSE;
-    }
@@ -125 +135 @@
-        { // "www.interlis.ch/INTERLIS2.2"
-            VSIFClose( fp );
+            CSLDestroy( filenames );
-            return FALSE;
-        }
@@ -143 +154 @@
-                  "configured in.", 
-                  pszNewName );
+        CSLDestroy( filenames );
-        return FALSE;
-    }
@@ -160 +172 @@
-    listLayer = poReader->GetLayers();
-
+    CSLDestroy( filenames );
+
-    return TRUE;
-}
@@ -173 +187 @@
-{
-    char **filenames = CSLTokenizeString2( pszFilename, ",", 0 );
-filenames[0]
-
+CPLStrdup(filenames[0])
+const char  *
-
-    if( pszModelFilename == NULL )
@@ -181 +195 @@
-                  "Model file '%s' (%s) not found.", 
-                  pszModelFilename, pszFilename, VSIStrerror( errno ) );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    char *iliFiles[1] = {(char *)pszModelFilename};
-       
-       
+    
+    
-        CPLError( CE_Warning, CPLE_OpenFailed, 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        CPLError( CE_Warning, CPLE_OpenFailed, 
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // create new basket
@@ -233 +250 @@
-    }
-
+    CSLDestroy(filenames);
+
-    basket=iom_newbasket(fpTransfer);
-    iom_setbaskettag(basket, basketname);
@@ -250 +269 @@
-
-{
-
+
+
+
+
+
+
-    return poLayer;
-}

trunk/gdal/ogr/ogrsf_frmts/ili/ogrili2driver.cpp

@@ -109 +109 @@
-/************************************************************************/
-
-
+
+
-    OGRSFDriverRegistrar::GetRegistrar()->RegisterDriver( new OGRILI2Driver );
-}

trunk/gdal/ogr/ogrsf_frmts/ili/ogrili2layer.cpp

@@ -44 +44 @@
-
-{
-    poFilterGeom = NULL;
-
-    if( poSRSIn == NULL )
-        poSRS = NULL;
@@ -73 +71 @@
-        poSRS->Release();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-/************************************************************************/
@@ -117 +103 @@
-OGRFeature *OGRILI2Layer::GetNextFeature() {
-    OGRFeature *poFeature = NULL;
-if
+while
-    {
-      poFeature = *(listFeatureIt++);
@@ -134 +120 @@
-/************************************************************************/
-
- {
-
-
-
-
-
-
-
-
-return OGRLayer::GetExtent( psExtent, bForce );
+
+
+
+
+
+
+
+
+
+  }
-}
-